OSDN Git Service

Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc...
authorLajos Molnar <lajos@google.com>
Tue, 28 Jun 2016 19:01:57 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 19:01:57 +0000 (19:01 +0000)
commitb353834077301c0cae5ee0e0e57fb772218a99c1
treed9785cb01d5c657f3c7b6b50aa79b5a6e731af3c
parentb22e74527840b6e85e8f01d5e953b6c3fe0d1f0d
parent41f0e20739842d0d7b9b746dc23ce36e1867a476
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-mr1-dev
am: 41f0e20739

Change-Id: I482ec13bc3cdf1d7b1a485c2c7baee5131102c56