OSDN Git Service

am 00c17b87: (-s ours) am 89c7b1a4: (-s ours) am 822b0367: (-s ours) am 51a59c80...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 14:41:09 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:41:09 +0000 (14:41 +0000)
* commit '00c17b877ae7eab891b43319acf606e08b9064a8':


Trivial merge