| commit | 6a10580caf2a9d79fed821f025d6627267cc4fa1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:15:47 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:15:47 2010 -0800 |
| tree | d7731fbbe4e37ff47c67fdc6f3bfb4a2e0042144 | |
| parent | 05172bd9a0d8f054bcb27a11e8803a5319f76c49 [diff] | |
| parent | a0f3e1af8d3b98d2428ef354df633cba740089d5 [diff] |
am a0f3e1af: am 2f787228: reconcile main tree with open-source eclair Merge commit 'a0f3e1af8d3b98d2428ef354df633cba740089d5' * commit 'a0f3e1af8d3b98d2428ef354df633cba740089d5': android-2.1_r1 snapshot