am cd026d99: (-s ours) am c5ed2a26: am db2aae51: am eef37a2a: am 4a3d88ee: (-s ours...
authorJarkko Pöyry <jpoyry@google.com>
Fri, 28 Aug 2015 17:44:13 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 17:44:13 +0000 (17:44 +0000)
* commit 'cd026d9956c3c30424534cb2b8b14bea903845ec':


Trivial merge