tree 238f29cd6b5e1506cfb1c15ad2653ddd0b96932d
parent 7823a6381ee6ebdf11b922123169d737921e6e22
parent 209731c4ae8c223e04e13717a4125907a67fcf4b
author James Dong <jdong@google.com> 1335470607 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335470607 -0700

am 209731c4: Merge "Add profile/level dump for encoders in cmd stagefright" into jb-dev

* commit '209731c4ae8c223e04e13717a4125907a67fcf4b':
  Add profile/level dump for encoders in cmd stagefright