Projects >> platform_frameworks_base >>d6dc43bf4f6decb5ff6bdec1a4edc6be6b4deb73

Chunk
Conflicting content 
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
<<<<<<< HEAD
=======
import java.util.ArrayList;
>>>>>>> c0524d26a6bcfa28a930f446717dffcd9ce3c3f5
import java.util.List;
import java.util.Map;
Solution content 
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
File
CacheManager.java
Developer's decision
Version 1
Kind of conflict
Import