am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa0: am 652dd63a: Merge...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 17:44:10 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 17:44:10 +0000 (17:44 +0000)
* commit '342b03b5dd261ed520678ce72fc4155b6fca7361':


Trivial merge