Projects >> platform_frameworks_base >>3530ebe451fea39b159baa9b8c9f9cd851de42a3

Chunk
Conflicting content 
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
<<<<<<< HEAD
import android.content.res.AssetManager;
import android.content.res.Resources;
=======
>>>>>>> 578e73dac8ba6cd27d3a708f691aefd8a1e33bbb
import android.database.ContentObserver;
import android.graphics.Typeface;
import android.os.Handler;
Solution content 
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.database.ContentObserver;
import android.graphics.Typeface;
import android.os.Handler;
File
DigitalClock.java
Developer's decision
Version 1
Kind of conflict
Import