am 175a9614: am cd026d99: (-s ours) am c5ed2a26: am db2aae51: am eef37a2a: am 4a3d88e...
authorJarkko Pöyry <jpoyry@google.com>
Fri, 28 Aug 2015 18:14:41 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:14:41 +0000 (18:14 +0000)
* commit '175a96140550f3ee11eaf5bc1717a491f54ab8a6':


Trivial merge