tree bf7e437c0438e2d659f23a829436dbbf568b73b3
parent d3bafad896b0eca2e7135722c9ae1129f593f46b
parent 2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc
author Fred Quintana <fredq@google.com> 1270157854 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270157854 -0700

am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo

Merge commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc' into kraken

* commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc':
  allow null authtokens to invalidateAuthToken