| commit | f425d6b6149696860083fd9c35a0ee0ae11c8a45 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 11:55:05 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 11:55:05 2010 -0700 |
| tree | 137313be527a5b40a7098ad72034813b1abfaf0b | |
| parent | 5177fcd308787e6c710bf28e3c36f88581f29942 [diff] | |
| parent | b4df348997795f2e60476ca4b67f9fe5501321db [diff] |
am b4df3489: am 34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward 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