tree 773cb546ed4f66bb7b93d832546b702135604a66
parent a990d6abfa42ca595d4b3f97f449fe2cf6aaf8c9
parent f1a0ec37b9edd755ba95835acedd6673dfd947e2
author Lajos Molnar <lajos@google.com> 1462867861 +0000
committer android-build-merger <android-build-merger@google.com> 1462867861 +0000

Merge changes I58b03acd,I7d7eb086 into nyc-dev am: 0d0a8b48d2
am: f1a0ec37b9

* commit 'f1a0ec37b9edd755ba95835acedd6673dfd947e2':
  stagefright: untangle metadata-mode handling
  stagefright: add a way to update native handle in OMX buffers

Change-Id: I9d1b51e1c6f486f1c8fe36383adcc4261b056256