am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair

Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373'

* commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373':
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project
2010-02-05 14:16:10 -08:00
committed by Android Git Automerger

Diff Content Not Available