am 280dd013: am 5c26a1c0: reconcile main tree with open-source eclair Merge commit '280dd0135a308847cc881dbf3feb5b1145158206' * commit '280dd0135a308847cc881dbf3feb5b1145158206': android-2.1_r1 snapshot