| commit | 282d39123949ca76ac96af79bdfb29407b723d02 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 14 16:15:12 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 14 16:15:12 2010 -0800 |
| tree | 1d9c459a2f33e6e56933842882ff353325fa7ce5 | |
| parent | 02e172e892190c1c94539594d639776c4b24efdf [diff] | |
| parent | 3463d0e1026263d9d740c3324138a346b0c9006d [diff] |
am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE * commit '3463d0e1026263d9d740c3324138a346b0c9006d': (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"