| commit | 1a7b84cf8cb3e87578c48569a4c8a874b020f70b | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Apr 06 02:24:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 02:24:50 2017 +0000 |
| tree | 2ba6cf4f91a93b6573016ee83169a1a59a2660ac | |
| parent | bc8339b051c2a2210997d697bd5cf7be78d10bac [diff] | |
| parent | 3cd234eef262398219f557b5bb84f57ae1541e29 [diff] |
Merge "TokenManager: use secure tokens" am: 9074e37a8b am: 3cd234eef2 Change-Id: I06f73e7d62e7bb0e844f113130fc4c9433c3fcf4