OSDN Git Service

am b4df3489: am 34acfcf6: merge -s ours from froyo-release so that upgrading to ginge...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 18:55:05 +0000 (11:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 18:55:05 +0000 (11:55 -0700)
Merge commit 'b4df348997795f2e60476ca4b67f9fe5501321db'

* commit 'b4df348997795f2e60476ca4b67f9fe5501321db':
  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


Trivial merge