am 90c7f555: (-s ours) am e5333493: (-s ours) am 84e26791: Merge "DO NOT MERGE: Remov...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 4 May 2015 17:08:11 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:08:11 +0000 (17:08 +0000)
* commit '90c7f555216af15523daab770b05e98344fd9002':


Trivial merge