tree 793a86c4e7281000f70dac6f2b49fe9e765d8f78
parent 3d32979e8a65f0137a48a0940c39202a6211f8f9
parent 2f78b8ba1225a92305ce6c03ef2898055b6a99ac
author Doug Zongker <dougz@android.com> 1251146632 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251146632 -0700

am 2f78b8ba: am 8fead691: Merge change 22448 into donut

Merge commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac'

* commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac':
  incremental OTAs should remove /system/recovery.img