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


Trivial merge