tree a1869dc5694f0fde291df0d39a28dd4fbaa3738c
parent 2b95e0d0aa003fe50158e3dcb1f6a81c745075da
parent 1d510671c72c1e2f6335eafc39dda523fbf48ca1
author Tao Bao <tbao@google.com> 1501020084 +0000
committer android-build-merger <android-build-merger@google.com> 1501020084 +0000

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

Change-Id: Ia4f78dc67bc2fac65eba6bb23a273eb3575d9dce