OSDN Git Service

am b919d6a9: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:10 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:10 +0000 (11:19 +0000)
* commit 'b919d6a9d009444168493fc05d3178e54f79556a':


Trivial merge