tree 7fd574307953a0bbde499194ab4006a7cae3f8b9
parent 42ab176195efbe16998e3162e9f6e987b13dfee4
parent 54ec81fe86225d5f3ee3ab16e3266ae88cd639fa
author Doug Zongker <dougz@android.com> 1254961061 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254961061 -0700

am 54ec81fe: Merge change I1c8ca2e4 into eclair

Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' into eclair-plus-aosp

* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
  replace generic recovery icons