tree 242917d13f3614f94d07a4de2265c4a21660e269
parent c485e4b98e33a71ff56c120a52f10b1719ecbe1c
parent 5b7c883da6527a411236592dd450893260485621
author The Android Open Source Project <initial-contribution@android.com> 1265388059 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388059 -0800

am 5b7c883d: reconcile main tree with open-source eclair

Merge commit '5b7c883da6527a411236592dd450893260485621' into eclair-plus-aosp

* commit '5b7c883da6527a411236592dd450893260485621':
  android-2.1_r1 snapshot