tree 1a8ae045671c1f4f085ea3eea2300d4351a12144
parent 16b194f8cd58048f571b190dc380a2d7398f0acd
parent 2cc2e4ab3031e5f21c33d06b0953e4615213cc3f
author Adam Cohen <adamcohen@google.com> 1381790856 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381790856 -0700

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 '2cc2e4ab3031e5f21c33d06b0953e4615213cc3f':
  Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)