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

* commit 'ced241f0b3426273686ee1cc679dd52b11041c2b':


Trivial merge