am 01832257: (-s ours) am 9eefd6e7: am 5efd3ca9: (-s ours) am fa285d6b: am 36059e0d...
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 18:24:59 +0000 (18:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:24:59 +0000 (18:24 +0000)
* commit '018322578a32071c429fba46db3d16ddf770ba04':


Trivial merge