tree 2ba6cf4f91a93b6573016ee83169a1a59a2660ac
parent 2a9cfe979dd7f1a92fe75c5977771f4f6de20478
parent 9074e37a8b48eeab2e7cb79be5c57ad819222d4f
author Steven Moreland <smoreland@google.com> 1491445280 +0000
committer android-build-merger <android-build-merger@google.com> 1491445280 +0000

Merge "TokenManager: use secure tokens"
am: 9074e37a8b

Change-Id: I8464efefb0cf68965b73414ec02340d6a56e9ee2