| commit | b9a978bab60578e1fbdad4e3ff244f7663f2df94 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:24:40 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:24:40 2010 -0800 |
| tree | 7895fd7d4e1c2d47424860b91f92700fe6e1a011 | |
| parent | 08a240807110c8e115ec5085ee615e2c24ecf6fa [diff] | |
| parent | b176f8cb88ad268c1faf33ef38964fbbdd3ace6f [diff] |
am b176f8cb: am 05aaabf9: reconcile main tree with open-source eclair Merge commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f' * commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f': android-2.1_r1 snapshot