tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 81d24da13ba8bb7c9f9b852f5f5d96b75924d8ba
parent fca80dec975f9ffd8998f0b6dbe3663823d14c7e
author Adam Cohen <adamcohen@google.com> 1392411130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411130 +0000

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 'fca80dec975f9ffd8998f0b6dbe3663823d14c7e':