tree 7e6a1f68ffb27d198b6b15e2165813ea9dccd48a
parent 953ce06f73e19ba4fa4c67dbaf741385ec170ba3
parent ec437d0e7e95420213abcebcb832eb10e8196a20
author Michael Jurka <mikejurka@google.com> 1349727924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349727924 -0700

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

* commit 'ec437d0e7e95420213abcebcb832eb10e8196a20':
  Fix bug 7288630: Folder icons clipped on manta