am 02797369: am 4c97c59e: reconcile main tree with open-source eclair

Merge commit '02797369a90d032b6860f91ad3add2f810efd66f'

* commit '02797369a90d032b6860f91ad3add2f810efd66f':
  android-2.1_r1 snapshot
tree: 3da3d0c16866eed943c51c33f3a73b80582d8014
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml