| commit | 8c932cbd0a9563d03e914051e6447728875e6c2b | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Jul 29 13:14:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 29 13:14:40 2014 +0000 |
| tree | e00e84fa098049f5d9dc522d32040d0edb29b261 | |
| parent | 716c7d2923b0bd455dd9e0464c0dbf289ba76965 [diff] | |
| parent | 3c7cb5234fa33f67a4029d6e858ccccf5c7feeb3 [diff] |
am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev * commit '3c7cb5234fa33f67a4029d6e858ccccf5c7feeb3': [HW7.5] Introduce the @Nonnull annotation
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