tree 4563ceef50c206c217b6cad69e85ac4461803ac4
parent 8b0af507d97b4e93bbe8d6afbc33d7840478729e
parent 7b31dd10948abccc9c8b2f949edbe84de15702d5
author Colin Cross <ccross@android.com> 1464041854 +0000
committer android-build-merger <android-build-merger@google.com> 1464041854 +0000

Merge "Error on USE_CLANG_PLATFORM_BUILD="
am: 7b31dd1094

* commit '7b31dd10948abccc9c8b2f949edbe84de15702d5':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Iea742a5cd8230587656460cc5ad6b979ba2189a5