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

* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
  Use default compiler flags for dicttool.
This commit is contained in:
Tim Murray 2015-03-20 23:19:19 +00:00 committed by Android Git Automerger
commit 052556d16b

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