tree 8ecbb11cf07bc49a3427c9866b679839f5fefc13
parent 88018051ebfe16db0d348f484b4949ebdb4a4ce8
parent 4b596e102e8e16cb1da163d24131f3b4fecf6b80
author Unsuk Jung <unsuk@google.com> 1384473863 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384473863 -0800

am 4b596e10: am d534fee6: am 26dd9bb3: Merge "Fixing Video perf test" into klp-dev

* commit '4b596e102e8e16cb1da163d24131f3b4fecf6b80':
  Fixing Video perf test