tree a5faaa115d80a6c5daf8f24eaeec7a3935713025
parent 8c6319b69c51102a0fae3baba0585130e278edab
parent a11517f68a3318ee8d4f7ab631f81f73d9401bee
author Andres Morales <anmorales@google.com> 1428946594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428946594 +0000

am a11517f6: am 00300a11: Merge "Fix addAuthToken api"

* commit 'a11517f68a3318ee8d4f7ab631f81f73d9401bee':
  Fix addAuthToken api