summaryrefslogtreecommitdiff
path: root/libutils
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2015-10-01 20:21:56 +0100
committerSergio Giro <sgiro@google.com>2015-10-01 20:21:56 +0100
commit3412280cbc287d49dca889ff22e7c65749cd58ef (patch)
tree9abedec649511eb3b398db2b5ab75c1c2e722e85 /libutils
parent45dd164bff09960f684fc70ab2a371a7f507701e (diff)
parent075f690dae125375a67eddce577fa6d8f6028711 (diff)
resolved conflicts for 075f690d to master
Change-Id: I35b870a1e43b9a4b9f09ecabee68c54f993b036f
Diffstat (limited to 'libutils')
-rw-r--r--libutils/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk
index 9f3b1df4d..8c4fd15b6 100644
--- 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 \