am 7faac846: (-s ours) am c80353d7: am ca5d0d73: Enable clang compilation for mips...
authorChih-Hung Hsieh <chh@google.com>
Mon, 11 Jan 2016 19:50:05 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:05 +0000 (19:50 +0000)
am: 5f2cee7114

* commit '5f2cee71146bc9c5634555cdaf12a5ed13b57fba':


Trivial merge