tree 04d39c6fedd89be76add82ea42a201d44ecac9f1
parent 465b1828c6adf53806e7891f226792b899a80617
parent 04e01d9e154c7d01b1e3ef3b99a7e519d0553720
author Unsuk Jung <unsuk@google.com> 1401144555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401144555 +0000

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

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