am 7faac846: (-s ours) am c80353d7: am ca5d0d73: Enable clang compilation for mips.
authorChih-Hung Hsieh <chh@google.com>
Thu, 27 Aug 2015 10:46:05 +0000 (10:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:46:05 +0000 (10:46 +0000)
* commit '7faac8463906537470bd11d85214f021491b94d5':


Trivial merge