tree 7e6a1f68ffb27d198b6b15e2165813ea9dccd48a
parent f4b2836d6c500a229dd7097c878b251b205d980b
parent 67c251bb26c7f1cdb89550ad805c4e521315e2a8
author Michael Jurka <mikejurka@google.com> 1349728070 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349728070 -0700

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

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