tree 78fafcd1b8364cb3587c56beae24c41cbfc5b915
parent b4eacebfc5c5fd86b20661eab0797ce70c66e323
parent 2b0b701f57c5efebe868d0eedce8cfc399007e8a
author Lajos Molnar <lajos@google.com> 1398975008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398975008 +0000

am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a':
  ACodec: add frame render/drop systrace