| commit | fb0447e72c641b2f81e39d2a238e289cf9f26825 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:46:33 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:46:33 2010 -0800 |
| tree | 93acbe895e1f510617f547cbb401d1271ec39307 | |
| parent | 102f6a912ff2c9ba9b94c6d0b0c213f5c0a4121d [diff] | |
| parent | f934e0dc443c844e96535b9fa8cb0bee63f4ca5d [diff] |
am f934e0dc: reconcile main tree with open-source eclair Merge commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d' into eclair-plus-aosp * commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d': android-2.1_r1 snapshot