| commit | 6294732d6562df9d5637ffc28b741b14f22b81a7 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jun 28 22:33:02 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 28 22:33:03 2016 +0000 |
| tree | 91f16ebf86b396c7a926ab2f05a97413f348598a | |
| parent | 3cdb912b8a736d25074410149212aac681b0ab87 [diff] | |
| parent | 6ebfcb99fd00eca8316f93a6bd3058fe81ca413e [diff] |
Merge "Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am: 556e012979 am: ac43565741" into nyc-mr1-dev-plus-aosp