tree 8eb907919db111a5cb1eabc623a045b8036d913d
parent ee7a5ef61b8d1149811ee73c80aca2ac8474d559
parent ee46bd378b7a68789be9c85d8a59fa02d4aed030
author Lajos Molnar <lajos@google.com> 1398975154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398975154 +0000

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

* commit 'ee46bd378b7a68789be9c85d8a59fa02d4aed030':
  ACodec: add frame render/drop systrace