am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa0: am 652dd63...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 18:14:38 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:14:38 +0000 (18:14 +0000)
* commit 'a7b6dc7ad9531cc64a54135a2c87f9ba8c257737':


Trivial merge