am 37c67d32: reconcile main tree with open-source eclair

Merge commit '37c67d328c94fa315dbf18dc53fe0b9929e55523' into eclair-plus-aosp

* commit '37c67d328c94fa315dbf18dc53fe0b9929e55523':
  android-2.1_r1 snapshot
tree: 721b2592e7607f3079c96e287a91fb971c459e8d
  1. Android.mk
  2. AndroidManifest.xml
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. res/
  6. src/