OSDN Git Service

am 89c7b1a4: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:28 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:28 +0000 (11:19 +0000)
* commit '89c7b1a4f17281ba925216f9313ca1bef96cdf31':


Trivial merge