OSDN Git Service

Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
authorLajos Molnar <lajos@google.com>
Mon, 25 Apr 2016 22:51:20 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 22:51:20 +0000 (22:51 +0000)
am: 4710431

* commit '4710431dc4751e9674b9e2e620f425603cf24643':
  clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ic92672b020aa9547a111e0bc728cb8edfa4a1656


Trivial merge