summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-29 23:52:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-29 23:52:54 +0000
commit265262a8b243faa16c268ac40801a226359437a6 (patch)
treeb8d170d3028bddddf5c3f591e4542103376539ea
parentdec41a388d58ae515c83df4ec084c1e38edb427a (diff)
parent5f815da3aba73e7605b72b6b3e2de648ca7c3390 (diff)
downloadsystem_core-265262a8b243faa16c268ac40801a226359437a6.zip
system_core-265262a8b243faa16c268ac40801a226359437a6.tar.gz
system_core-265262a8b243faa16c268ac40801a226359437a6.tar.bz2
am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
* commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390': String16.cpp rm unused utils/Debug.h
-rw-r--r--libutils/String16.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index b09b728..3bdc349 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -16,7 +16,6 @@
#include <utils/String16.h>
-#include <utils/Debug.h>
#include <utils/Log.h>
#include <utils/Unicode.h>
#include <utils/String8.h>