am 36059e0d: am 7ce9438a: am 0870de9a: (-s ours) DO NOT MERGE Do not require signed...
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 04:25:10 +0000 (04:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:25:10 +0000 (04:25 +0000)
* commit '36059e0d30f37b8235063442d15d01084bc537e1':


Trivial merge