am 5efd3ca9: (-s ours) am fa285d6b: am 36059e0d: am 7ce9438a: am 0870de9a: (-s ours...
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 17:44:11 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 17:44:11 +0000 (17:44 +0000)
* commit '5efd3ca9eafc1faf62ce74bf11e1d7fbd90ead1a':


Trivial merge