tree 32cccae4d794caf8ed46726004dbc35f16923c99
parent c02c37a1e6bd67198a6522461b81c9cdd125625e
parent 17986e6b8766ef9bdaa49efc7099e3867ca1978a
author Doug Zongker <dougz@android.com> 1281660924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281660924 -0700

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

Merge commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a' into gingerbread-plus-aosp

* commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a':
  fix bug in applying patches