OSDN Git Service

Merge "Merge \\"media: document format keys for MediaExtractor/CodecCapabilities...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 28 Jun 2016 22:33:02 +0000 (22:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jun 2016 22:33:03 +0000 (22:33 +0000)
commit6294732d6562df9d5637ffc28b741b14f22b81a7
tree91f16ebf86b396c7a926ab2f05a97413f348598a
parent3cdb912b8a736d25074410149212aac681b0ab87
parent6ebfcb99fd00eca8316f93a6bd3058fe81ca413e
Merge "Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am: 556e012979 am: ac43565741" into nyc-mr1-dev-plus-aosp