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

* commit 'e30dd1b8d31db311b7e3836d67a9a4fcc60052b3':


Trivial merge