tree 86985f3c1006036e54ec07e7e9d902eaf7cf753e
parent e03ef71c424bc2944640c8a703aa97dd8447d4ca
parent 3b78a2497fef8d6620c64993eaf075b8c547c8de
author Glenn Kasten <gkasten@google.com> 1440674885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674885 +0000

am 3b78a249: (-s ours) am 569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev

* commit '3b78a2497fef8d6620c64993eaf075b8c547c8de':