tree a5d3ea486b907c77abd820d7df12fb224ed0a417
parent 5d2dd34bd60b3dc33981018dc0adc3a7020b4bef
parent cc4d7d89e9d47a5b6e0bc00881f60bb619d32714
author The Android Open Source Project <initial-contribution@android.com> 1265407801 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407801 -0800

am cc4d7d89: am 5bbcf18e: reconcile main tree with open-source eclair

Merge commit 'cc4d7d89e9d47a5b6e0bc00881f60bb619d32714'

* commit 'cc4d7d89e9d47a5b6e0bc00881f60bb619d32714':
  android-2.1_r1 snapshot