| commit | dde1b40a7f53b6a907c3890098fede2dea917f77 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Jul 30 16:58:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 30 16:58:14 2014 +0000 |
| tree | df0a784fe3fde36ebca14ee458fff1ce35b355cd | |
| parent | 85d12427e7afd7de702bb886364666327d81b0c7 [diff] | |
| parent | 5a7b634aaf21895637a305e0795df666e24c890a [diff] |
am 5a7b634a: Merge "Add entry iteration method to TrieMap." into lmp-dev * commit '5a7b634aaf21895637a305e0795df666e24c890a': Add entry iteration method to TrieMap.
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