am ea3bc5ca: am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp

* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
  Use default compiler flags for dicttool.
main
Tim Murray 2014-07-24 21:27:56 +00:00 committed by Android Git Automerger
commit 5d44dfe005
1 changed files with 0 additions and 1 deletions

View File

@ -34,7 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
LOCAL_MULTILIB := 64
endif #HOST_JDK_IS_64BIT_VERSION
LOCAL_CLANG := true
# For C++11
LOCAL_CFLAGS += -std=c++11