tree 3027bd6cb3d542e30fbf9c6c9c0801bc6fbad2b9
parent e6c1cc7a0f23ce2b62e18e6e6242ed86a8dfd5fd
parent 75a874fd94e7e38cfd75e7b2f6dad57fe12f27c0
author Unsuk Jung <unsuk@google.com> 1401144701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401144701 +0000

am 75a874fd: 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 '75a874fd94e7e38cfd75e7b2f6dad57fe12f27c0':
  Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor