OSDN Git Service

am d9c16af5: (-s ours) am c4cf6d5f: (-s ours) am ede11beb: (-s ours) am 34663b0f...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 14:40:53 +0000 (14:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:40:53 +0000 (14:40 +0000)
* commit 'd9c16af5a202f8bfe23114da01032612d6e9baf5':


Trivial merge