tree 88f47c9b0cba1d1bb1b2b3a6db7becd4a6384c0d
parent 181ea5de80fb48739a1411ee5369ccda1510ac84
parent 209af33ada8796ed4b27d96bc6d625a08a015813
author Unsuk Jung <unsuk@google.com> 1401144279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401144279 +0000

am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev

* commit '209af33ada8796ed4b27d96bc6d625a08a015813':
  Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor