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:42 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 22:26:42 +0000 (22:26 +0000)
commitac435657413ba417c04d8185ff1438798782196b
tree74b1a9b8ef1dbd9671dc4f3bc5f5f0840fd26e42
parent9585012ce39c4e2d1fbd78dac5304bd2506e2049
parent556e012979c4fcde6b01452623c1be909eed7cc0
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am: 556e012979

Change-Id: I248fbd3da8dd0376d724ca8aee7f8e71bfb260b0