| commit | 22f10ac4016c6879f55d65b16765440ff9453f58 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:05:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:05:31 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e [diff] | |
| parent | 7424f8c587fb4802d4b923e9b512f66a28f24c97 [diff] |
am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
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