am d95f74b9: (-s ours) am 90c7f555: (-s ours) am e5333493: (-s ours) am 84e26791...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 4 May 2015 17:18:32 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:18:32 +0000 (17:18 +0000)
* commit 'd95f74b9cf500507781fdd2bc5873967f8a17ea2':


Trivial merge