| commit | c9bba853fa00f03bfc9b49931e320957adc15b20 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Tue Jul 29 15:51:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 29 15:51:07 2014 +0000 |
| tree | 545fcd35c668f962f75b6dbc76918836369ed8ec | |
| parent | 8a584a2f610c2baf6f343fdccfb1eae42eda4351 [diff] | |
| parent | 666f1b384f539c6426b9ee7bd6312005c69a3350 [diff] |
am 666f1b38: Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev * commit '666f1b384f539c6426b9ee7bd6312005c69a3350': Revert "[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