OSDN Git Service

Merge \"Merge \\\"media: document format keys for MediaExtractor/CodecCapabilities...
authorLajos Molnar <lajos@google.com>
Tue, 28 Jun 2016 22:37:31 +0000 (22:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 22:37:31 +0000 (22:37 +0000)
commit44357b3cee2d8db0482b5bb44e91f47230c25ac6
tree8c8db74a51b0813504a0f27ca0160c2e0e3021b9
parentdc74e5fa9b5b121a9b51ba9b4f6e10d3ab350c07
parent6294732d6562df9d5637ffc28b741b14f22b81a7
Merge \"Merge \\\"media: document format keys for MediaExtractor/CodecCapabilities\\\" into nyc-dev am: 556e012979 am: ac43565741\" into nyc-mr1-dev-plus-aosp
am: 6294732d65

Change-Id: I0045f0fa609ccf42cfd09adf2c17cee481084645