am ced241f0: am 7faac846: (-s ours) am c80353d7: am ca5d0d73: Enable clang compilatio...
authorChih-Hung Hsieh <chh@google.com>
Thu, 27 Aug 2015 14:47:00 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:00 +0000 (14:47 +0000)
* commit 'ced241f0b3426273686ee1cc679dd52b11041c2b':


Trivial merge