am 56cd4770: am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 18:24:58 +0000 (18:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:24:58 +0000 (18:24 +0000)
* commit '56cd477015d45d87bd4622b90d44c2ba7cd6a991':


Trivial merge