tree d4456ed363a16df4cb137021a94a8a847248c8c5
parent 2ce4c3487389e3887c6ec085069422ad69cd570c
parent ef7d1cfaa3c143bf049848c61b68b6a650a57925
author Mike Cleron <mcleron@google.com> 1257988916 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257988916 -0800

am ef7d1cfa: am c23c549a: Fix bug 2122011: Force a dimension for live folder icons

Merge commit 'ef7d1cfaa3c143bf049848c61b68b6a650a57925' into eclair-mr2-plus-aosp

* commit 'ef7d1cfaa3c143bf049848c61b68b6a650a57925':
  Fix bug 2122011: Force a dimension for live folder icons