| commit | b4df348997795f2e60476ca4b67f9fe5501321db | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 23:36:16 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 23 23:36:16 2010 -0700 |
| tree | 6c820db86612e62ba18b673a787e50b456831e1d | |
| parent | 2eed660c667550f1b810303b13ee0c7e84455bf0 [diff] | |
| parent | 34acfcf6858fa4c9183d4e4d2e10f15cf932285f [diff] |
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