tree 7895fd7d4e1c2d47424860b91f92700fe6e1a011
parent 08a240807110c8e115ec5085ee615e2c24ecf6fa
parent b176f8cb88ad268c1faf33ef38964fbbdd3ace6f
author The Android Open Source Project <initial-contribution@android.com> 1265408680 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408680 -0800

am b176f8cb: am 05aaabf9: reconcile main tree with open-source eclair

Merge commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f'

* commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f':
  android-2.1_r1 snapshot