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


Trivial merge