tree 7e6a1f68ffb27d198b6b15e2165813ea9dccd48a
parent dad6ca7b1417984c579eadc50f3a1d9a948042fe
parent dd3a2bd40c9f1f69b8b1ccb4eebb4e59d4a9375b
author Michael Jurka <mikejurka@google.com> 1349727803 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349727804 -0700

Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev