tree 936b00e763106a28dd58b7ae890ccf8117282ba9
parent 1e30b1302ea560bf33da290b2ed9bc1842e85b80
parent 2fbf97b3b53a12583acb161e8df8aa5f1105d2d6
author The Android Open Source Project <initial-contribution@android.com> 1265408241 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408241 -0800

am 2fbf97b3: am 572f793b: reconcile main tree with open-source eclair

Merge commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6'

* commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6':
  android-2.1_r1 snapshot