am 7696e8a3: am 518a9708: am aed69b89: Merge change Ic8a8a250 into eclair

Merge commit '7696e8a3d9b2a3fce1111d20cb80a3f01a52b341'

* commit '7696e8a3d9b2a3fce1111d20cb80a3f01a52b341':
  Add Authentication Type field to the database.
tree: 9f9d8166dfc1e93888d31c8f6ebb722311ab660d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE