am 003242c4: (-s ours) am ab7acf1c: (-s ours) am f1131705: (-s ours) am a83f8e59...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 4 May 2015 17:18:31 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:18:31 +0000 (17:18 +0000)
* commit '003242c4021e0d991e848cd66594c2d133791061':


Trivial merge