tree c75c6164b24bd27b82c833db5836767fb208ddd4
parent 331e52bbf5269d9effdbe42c1b26b4768f03a911
parent 96c4d0b9f58229b9dbba51f1776addedc66f4749
author Ficus Kirkpatrick <ficus@android.com> 1445994458 +0000
committer android-build-merger <android-build-merger@google.com> 1445994458 +0000

Merge "Add API to get Auth Token Type used by authenticator." am: 708ade5a69
am: 96c4d0b9f5

* commit '96c4d0b9f58229b9dbba51f1776addedc66f4749':
  Add API to get Auth Token Type used by authenticator.