tree a44246dd62d1029839b674956bf507c6791ed628
parent 6e99b91fd0a21caa6c90cabcabfe65407a2eea73
parent 1bc6334312e9d4a0e0982db9e5769f975aa7494c
author Tao Bao <tbao@google.com> 1501020323 +0000
committer android-build-merger <android-build-merger@google.com> 1501020323 +0000

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

Change-Id: Ib794876faa040993e6b6d128fae28f80bfa91566