commit | b6219edf7930227c51351f725914078b02767c0a | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:22:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:22:10 2015 +0000 |
tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
parent | 3b9594a1f2a3f996343e0c02ea64575d2d931cd3 [diff] | |
parent | 52f1b6c5fdf1f02886c8f961e155145d74b41b08 [diff] |
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 '52f1b6c5fdf1f02886c8f961e155145d74b41b08':