tree b4f8fa773978e58a60171ea2efbd931ec79d13e6
parent d8309af6148d6496ca6c73ed0a29ba26957d1512
parent f7a730248fa772625f519cd6a75b1fb6b30c9101
author The Android Open Source Project <initial-contribution@android.com> 1265388338 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388338 -0800

am f7a73024: reconcile main tree with open-source eclair

Merge commit 'f7a730248fa772625f519cd6a75b1fb6b30c9101' into eclair-plus-aosp

* commit 'f7a730248fa772625f519cd6a75b1fb6b30c9101':
  android-2.1_r1 snapshot