resolved conflicts for 075f690d to master

Change-Id: I35b870a1e43b9a4b9f09ecabee68c54f993b036f
2015-10-01 20:21:56 +01:00 · 2015-10-01 20:21:56 +01:00 · 3412280cbc
parent 45dd164bff 075f690dae
commit 3412280cbc
1 changed files with 0 additions and 1 deletions
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@ -15,7 +15,6 @@
 LOCAL_PATH:= $(call my-dir)

 commonSources:= \
-	BasicHashtable.cpp \
 	CallStack.cpp \
 	FileMap.cpp \
 	JenkinsHash.cpp \