tree 6e5b3f371dd380c49459dfb7fe8a9ac0461b3959
parent 335eafc39d1f3dd46cebdff1ebb801493b6fa520
parent 2affd4cac169d84029f57f8a9b9fc7d8880de9b1
author Tao Bao <tbao@google.com> 1501020804 +0000
committer android-build-merger <android-build-merger@google.com> 1501020804 +0000

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

Change-Id: I8900100cf29ceec8b9d795b8772104670b44f4ab