OSDN Git Service

am 34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 06:36:16 +0000 (23:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 06:36:16 +0000 (23:36 -0700)
commitb4df348997795f2e60476ca4b67f9fe5501321db
tree6c820db86612e62ba18b673a787e50b456831e1d
parent2eed660c667550f1b810303b13ee0c7e84455bf0
parent34acfcf6858fa4c9183d4e4d2e10f15cf932285f
am 34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

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