am fef7d7ab: (-s ours) am 48c21c9a: (-s ours) am 0870de9a: DO NOT MERGE Do not requir...
authorPyry Haulos <phaulos@google.com>
Wed, 6 May 2015 22:44:30 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 May 2015 22:44:30 +0000 (22:44 +0000)
* commit 'fef7d7ab988223f47776bd152bd89dd9ddb64bf2':


Trivial merge