tree 9af56e12944b3e3a3f9981c6fc4041331be37d19
parent 4c5f9f341665ac4c1474afca92863cc02d9e1a13
parent 4e9332cb0bb84df4c08bbb469e59a54eab2a9df0
author Doug Zongker <dougz@android.com> 1263413831 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263413831 -0800

am 4e9332cb: am 22d79a5c: make offsets in firmware update header not point to bad blocks

Merge commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0'

* commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0':
  make offsets in firmware update header not point to bad blocks