tree 10da860fcff71886af91d082e31f0e1917926848
parent 42c83de7ef48f94c305f3cc260523900fcc3b4d3
parent 66bb2a44a22428b0c681019d99e37fb6b728c220
author Adam Cohen <adamcohen@google.com> 1414566276 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566276 +0000

am 66bb2a44: 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 '66bb2a44a22428b0c681019d99e37fb6b728c220':