OSDN Git Service

Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev
authorLajos Molnar <lajos@google.com>
Wed, 13 May 2015 23:01:27 +0000 (23:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 23:01:28 +0000 (23:01 +0000)
1  2 
api/current.txt
api/system-current.txt

diff --cc api/current.txt
Simple merge
Simple merge