tree 6e5b3f371dd380c49459dfb7fe8a9ac0461b3959
parent 9d270b63adbb52bcdbdf178db3337f7e49afcf42
parent b0e8a507ac3c48106892aeb660c55109a89c4595
author Tao Bao <tbao@google.com> 1501020563 +0000
committer android-build-merger <android-build-merger@google.com> 1501020563 +0000

Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7 am: 1bc6334312
am: b0e8a507ac

Change-Id: I896d73cb352cce7844bf1b02a2f7e4f303fccb29