tree 855d7f68079f3df896f40ef7b5ca24874ac18d96
parent fdb90f355b269737fe48a2da0593b37d5c2b83c1
parent ee0eba046f666303741a5a5f70afad17030cc8b1
author Lajos Molnar <lajos@google.com> 1458885572 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458885573 +0000

Merge "stagefright: MediaCodecSource: protect output format updates" into nyc-dev