| commit | 26ab7084b508d2052c3e4e62e9c6d0f7d08211d1 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Nov 19 11:02:49 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 19 11:02:49 2009 -0800 |
| tree | caef188344f20315b94a0ec671294766d1858b9c | |
| parent | f711e3494ca8e740c19f77ec753051e0517208a3 [diff] | |
| parent | 07e1232a2dc2887ba0003d629032c21fbb426652 [diff] |
am 07e1232a: resolved conflicts for merge of 90b35770 to eclair-mr2 Merge commit '07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp * commit '07e1232a2dc2887ba0003d629032c21fbb426652': Update version name to 2.1 and API to 7.