tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent a5ae0e632b25e9daf5276ccfc3b6dc143d46720b
parent 5a3411352320d7fb6c58822cbf4711e6b33ce088
author Adam Cohen <adamcohen@google.com> 1392411599 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411599 +0000

am 5a341135: am fca80dec: am 41776eca: am 2cc2e4ab: am 2ac85a6d: Merge "Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '5a3411352320d7fb6c58822cbf4711e6b33ce088':