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

Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
This commit is contained in:
Tim Murray 2014-07-24 14:21:52 -07:00
commit da9cc77339

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