OSDN Git Service

am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
authorLajos Molnar <lajos@google.com>
Mon, 11 Jan 2016 18:03:08 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 18:03:08 +0000 (18:03 +0000)
commit18e8be647d9c235608c41fe065641fe7fcc43698
treefe67a59efa0ed65fbfdce79a4d9bb59267fad6ff
parent137fba0db389b6f343e9f9d6f5e9f1268a768e15
parentfe96c1891e42a408247ff6bf8827b3c8ffb68f83
am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
am: fe96c1891e

* commit 'fe96c1891e42a408247ff6bf8827b3c8ffb68f83':