tree e9fa21f33c14820c230fdde465207afe75e61a03
parent a3b8c24661eb8d7bab718029dbbfe35b4cfc57ac
parent 1c0de60e809c116fb8cb0eded39270c6eb060a3b
author Lajos Molnar <lajos@google.com> 1456793663 +0000
committer android-build-merger <android-build-merger@google.com> 1456793663 +0000

Merge "stagefright: use MediaImage2" into nyc-dev
am: 1c0de60e80

* commit '1c0de60e809c116fb8cb0eded39270c6eb060a3b':
  stagefright: use MediaImage2