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

Merge commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc' into kraken

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