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