OSDN Git Service

Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 28 Jun 2016 18:54:23 +0000 (18:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jun 2016 18:54:24 +0000 (18:54 +0000)

Trivial merge