tree 9f9d8166dfc1e93888d31c8f6ebb722311ab660d
parent 4951544ef718f07c43c78e13798a8e1267509af1
parent 7696e8a3d9b2a3fce1111d20cb80a3f01a52b341
author Jaikumar Ganesh <jaikumar@google.com> 1256798858 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256798858 -0700

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

Merge commit '7696e8a3d9b2a3fce1111d20cb80a3f01a52b341'

* commit '7696e8a3d9b2a3fce1111d20cb80a3f01a52b341':
  Add Authentication Type field to the database.