am 44e478f9: (-s ours) am 01832257: (-s ours) am 9eefd6e7: am 5efd3ca9: (-s ours...
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 18:33:23 +0000 (18:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:33:23 +0000 (18:33 +0000)
* commit '44e478f9facd2a661b0085ee10e8fcd6c546a654':


Trivial merge