OSDN Git Service

Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev
authorLajos Molnar <lajos@google.com>
Fri, 11 Mar 2016 01:44:56 +0000 (01:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 01:44:57 +0000 (01:44 +0000)

Trivial merge