tree 741aebaf37dec3dd2e2b3f3e1669d57b780d3365
parent 07a85951c4fd371a2f2d3440fdc995ae7b47a493
parent 18e8be647d9c235608c41fe065641fe7fcc43698
author Lajos Molnar <lajos@google.com> 1452536119 +0000
committer android-build-merger <android-build-merger@google.com> 1452536119 +0000

am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev am: fe96c1891e
am: 18e8be647d

* commit '18e8be647d9c235608c41fe065641fe7fcc43698':