tree da7d170e1c839e01d3604ed453c4ba35f9d87974
parent 8274b049020e9c8f0b0a892c24d6308d92dd3b92
parent f04e8b5e51cfc868e5e58e1ad234095c8b7505ad
author Lajos Molnar <lajos@google.com> 1414010850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010850 +0000

am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev

* commit 'f04e8b5e51cfc868e5e58e1ad234095c8b7505ad':
  stagefright: try to free codec instance if MediaCodec.release hangs