| commit | ba86691696027ada473c9ef28d4eccdcde2e049f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:15:06 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:15:06 2010 -0800 |
| tree | bb7e4b89bbbaa0a0d9439e309b931a0ef8d018dd | |
| parent | 607189f2a56878cc9f35168d1fb487709b9351ac [diff] | |
| parent | 543e96aa39ab408aaaf83a2de364a01ca07f3689 [diff] |
am 543e96aa: am 3289d8fe: reconcile main tree with open-source eclair Merge commit '543e96aa39ab408aaaf83a2de364a01ca07f3689' * commit '543e96aa39ab408aaaf83a2de364a01ca07f3689': android-2.1_r1 snapshot