am 2d3353be: am 04f4c51c: reconcile main tree with open-source eclair

Merge commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6'

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