am 97900287: am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Browse Source

Merge commit '979002871ddc417dfdfb6a6542b9018626af7883'

* commit '979002871ddc417dfdfb6a6542b9018626af7883':
  fix bug in applying patches
  remove shadowed variable declaration

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-24 11:54:52 -07:00 committed by Android Git Automerger

parent baf6e35473 979002871d

commit 37d58711f6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available