OSDN Git Service

am 3b78a249: (-s ours) am 569737c6: Merge "Add USB out_get_presentation_position...
authorGlenn Kasten <gkasten@google.com>
Thu, 27 Aug 2015 11:28:05 +0000 (11:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:28:05 +0000 (11:28 +0000)
* commit '3b78a2497fef8d6620c64993eaf075b8c547c8de':


Trivial merge