tree a4560f1c499651bd5700b736bc85916229b6a7ed
parent 4115939d5c530d87553ffffed6c04256212dac1e
parent eb895a90baaf95a483d6fa76fe29440b05938e94
author Mike Cleron <mcleron@google.com> 1257989468 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257989468 -0800

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

Merge commit 'eb895a90baaf95a483d6fa76fe29440b05938e94'

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