tree 4af660acb1f3bfc9054913ee53c86378a0a420c9
parent 27388703838717cc10b49b7a81299ffe9e8cb86b
parent f387bb96e302356eea342f454052ebef65bddca8
author Daniel Xie <dxie@google.com> 1442956567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442956567 +0000

am f387bb96: am b3f5d824: am 81402212: 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 'f387bb96e302356eea342f454052ebef65bddca8':