am aed69b89: Merge change Ic8a8a250 into eclair

Merge commit 'aed69b896e1266c027d8b2094b24f1ae247bd8ce' into eclair-mr2

* commit 'aed69b896e1266c027d8b2094b24f1ae247bd8ce':
  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