OSDN Git Service

Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs...
authorPavlin Radoslavov <pavlin@google.com>
Wed, 29 Mar 2017 23:04:01 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 23:04:01 +0000 (23:04 +0000)
am: 7035d9a920

Change-Id: I97a0ca52a8e1d2dbccb9ff2263eec62772358df6


Trivial merge