tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent d6216b6aafbc3edb6288493d7cb36aaf2429fc19
parent 41776eca8ecf87435eef5fcfb47c80ca82e08de8
author Adam Cohen <adamcohen@google.com> 1392410215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410215 +0000

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 '41776eca8ecf87435eef5fcfb47c80ca82e08de8':