tree c528b50253a0b8f572ea7603bb186a5a0e0242c8
parent 49c82ce55385b60a61236e79fc5c4185871a1d03
parent 2f4fc56183f3fe2edb5e3cd5e12329871e02518f
author Doug Zongker <dougz@android.com> 1253194708 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253194708 -0700

am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is short

Merge commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f'

* commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f':
  don't complain if recovery icon is short