tree ac9f88b6c72f7e29f86a773a62150f46bd5815d3
parent 04611da55b13f9697173d3aa947b3a735b96c01f
parent c4e3200578ad670bee9f5a88e90e7a77089d5df7
author Doug Zongker <dougz@android.com> 1281661065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281661065 -0700

am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patches

Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7'

* commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7':
  fix bug in applying patches