tree cba62d0d64153aa2169651696bc238591341d679
parent 426e728d064fd08065a4acedd8b55ed7df89bb7c
parent 5a3411352320d7fb6c58822cbf4711e6b33ce088
author Adam Cohen <adamcohen@google.com> 1414085350 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085350 +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':