commit | cfaf75bb963b6186e1be1c7ba4e265d29cd0c7fb | [log] [tgz] |
---|---|---|
author | Ken Wakasa <kwakasa@google.com> | Thu Aug 07 11:47:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 07 11:47:42 2014 +0000 |
tree | 48c993e97f4a2f5830a47cf2d352a3460b3560fe | |
parent | c5ff9e4e23c162a75bedc6c4e4ae6fbfa0080e82 [diff] | |
parent | 0f2de75e310a95cf39a12fde56b9e7d81e9ac30b [diff] |
am 0f2de75e: Merge "Revert "Remove unused animation resources"" into lmp-dev * commit '0f2de75e310a95cf39a12fde56b9e7d81e9ac30b': Revert "Remove unused animation resources"
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk index 028025d..ffb32ed 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk
@@ -34,7 +34,6 @@ LOCAL_MULTILIB := 64 endif #HOST_JDK_IS_64BIT_VERSION -LOCAL_CLANG := true # For C++11 LOCAL_CFLAGS += -std=c++11