commit | c787bd666330f872e2f3aff0d3f590724f95d574 | [log] [tgz] |
---|---|---|
author | Dan Zivkovic <zivkovic@google.com> | Mon Mar 23 23:16:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 23:16:51 2015 +0000 |
tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
parent | d3c5d3f59450fe907ccdb79a43e7b5d1096507e8 [diff] | |
parent | 6f09e99d24b4f67ef14d78a18a246da67cca650e [diff] |
am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE * commit '6f09e99d24b4f67ef14d78a18a246da67cca650e': Block overflow menu during setup. DO NOT MERGE
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