tree c75c6164b24bd27b82c833db5836767fb208ddd4
parent 347d39cc22ce3e24a73150f3c4643bb42787b855
parent d6de789bd63bc6d2c441c577fb1424309964ad8f
author Ficus Kirkpatrick <ficus@android.com> 1446000236 +0000
committer android-build-merger <android-build-merger@google.com> 1446000236 +0000

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

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