am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair
The Android Open Source Project authored
Merge commit '0341ac9a'

* commit '0341ac9a':
  android-2.1_r1 snapshot
3a122f96