tree 32cccae4d794caf8ed46726004dbc35f16923c99
parent 23ceeea85e6a3555dd3d7140128e310954cadf7f
parent 8cd9e4f3d4eba481b411482331293c8079ab24b2
author Doug Zongker <dougz@android.com> 1281660754 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281660754 -0700

am 8cd9e4f3: fix bug in applying patches

Merge commit '8cd9e4f3d4eba481b411482331293c8079ab24b2' into gingerbread

* commit '8cd9e4f3d4eba481b411482331293c8079ab24b2':
  fix bug in applying patches