| commit | a3a9c69b4956ad6c056fb331cd685478b9402ef5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:42:04 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:42:04 2010 -0800 |
| tree | b3db00adab2a9a61fc29a807337d426a0e6e72a2 | |
| parent | 4f50ecc1cc90a03931e6cec0c89f5af44ab79f6b [diff] | |
| parent | 87d1452b857460447250b8413d48e2c573f29bd6 [diff] |
am 87d1452b: reconcile main tree with open-source eclair Merge commit '87d1452b857460447250b8413d48e2c573f29bd6' into eclair-plus-aosp * commit '87d1452b857460447250b8413d48e2c573f29bd6': android-2.1_r1 snapshot