| commit | 3526ce6c7685371779c6d788db1e4adb25f4f901 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:17:21 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:17:21 2010 -0800 |
| tree | 936b00e763106a28dd58b7ae890ccf8117282ba9 | |
| parent | 1e30b1302ea560bf33da290b2ed9bc1842e85b80 [diff] | |
| parent | 2fbf97b3b53a12583acb161e8df8aa5f1105d2d6 [diff] |
am 2fbf97b3: am 572f793b: reconcile main tree with open-source eclair Merge commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6' * commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6': android-2.1_r1 snapshot