OSDN Git Service

Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
authorLajos Molnar <lajos@google.com>
Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)
am: 556e012979

Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f


Trivial merge