| commit | ee63d2f184c688e3be6305e376842aff495911a7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:03:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:03:50 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | 4fff69df71c6d68184d8a066f0b9c0b4a1283018 [diff] | |
| parent | 8e3f5ce18f27caf8fc158a67dc04c1ed45b3f7c8 [diff] |
am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '8e3f5ce18f27caf8fc158a67dc04c1ed45b3f7c8': 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