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

Merge commit '5bac1db49ae882e03834340fc39c3342c4c09e72'

* commit '5bac1db49ae882e03834340fc39c3342c4c09e72':
  android-2.1_r1 snapshot
tree: 67fd8daed633359bad3e6a65da1d54fb9238732d
  1. Android.mk
  2. AndroidManifest.xml
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. res/
  6. src/