am 02797369: am 4c97c59e: reconcile main tree with open-source eclair
Merge commit '02797369a90d032b6860f91ad3add2f810efd66f' * commit '02797369a90d032b6860f91ad3add2f810efd66f': android-2.1_r1 snapshotmain
commit
000ee1d751
Merge commit '02797369a90d032b6860f91ad3add2f810efd66f' * commit '02797369a90d032b6860f91ad3add2f810efd66f': android-2.1_r1 snapshotmain