tree 505bc0898968dbd345483da0d9bd9bae1f10a222
parent 1d1b00ec0cb55f8399f53b4ff0e0c0eb51e69f5a
parent e027023eb2c384b77c124d55fdc1711035d52781
author Michael Jurka <mikejurka@google.com> 1349728212 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349728212 -0700

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

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