OSDN Git Service

am 9c114bb7: (-s ours) am b3461336: (-s ours) am 853b55b9: Merge remote-tracking...
authorAdam Skory <skory@google.com>
Thu, 23 Oct 2014 19:38:43 +0000 (19:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 19:38:43 +0000 (19:38 +0000)
* commit '9c114bb76edd1fe6bb0cc94b9e413495b7962887':


Trivial merge