| commit | 6292607e0d4c218880bae269a235fd2944cc4d74 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:22:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:22:56 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | e2d0ffd8a9a455df2bb6ba421d4c2ecbdce3ec42 [diff] | |
| parent | 97c66ce52dc20a705f1d289ce1c3111ae936723c [diff] |
am 97c66ce5: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '97c66ce52dc20a705f1d289ce1c3111ae936723c': Import translations. 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