am 34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Browse source

Merge commit '34acfcf6858fa4c9183d4e4d2e10f15cf932285f' into gingerbread-plus-aosp

* commit '34acfcf6858fa4c9183d4e4d2e10f15cf932285f':
  FRG51
  FRG49
  bump version from 2.2 to 2.2.1 for next froyo release
  FRG22D
  FRG22C
  FRG22B
  33b special
  FRG33
  FRG22
  FRG15B
  FRG15
  FRG01B
  FRG08
  FRG01
  FRF81

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-23 23:36:16 -07:00 committed by Android Git Automerger

parent 2eed660c66 34acfcf685

commit b4df348997

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 is not available