tree 0fe003ba0d24a69430cffa048f11766abc81bc61
parent d24bf7e3b4bca5e4bc343b4c66fa1c018088a45e
parent 079ccc129ac0c19a0fdd8ce3e16138946af9f788
author Daniel Xie <dxie@google.com> 1442954511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442954511 +0000

am 079ccc12: am b6219edf: am 52f1b6c5: am 63049dce: am afb0b2ff: am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c

* commit '079ccc129ac0c19a0fdd8ce3e16138946af9f788':