commit | 6cfbd96e493bfd96cda2ad019bd8421d022e5ed4 | [log] [tgz] |
---|---|---|
author | Raphael Kim <raphk@google.com> | Tue Sep 26 19:19:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 19:19:23 2023 +0000 |
tree | ae15b53a0fd97aa571bda5977c03a058ac53129f | |
parent | 58829717652b7d3bbb4db92b5436fbf98d31349e [diff] | |
parent | 12db897275e304c6cb3f426545769e10c60f7e60 [diff] |
Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future am: ffc308aab8 am: 12db897275 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24827551 Change-Id: Ic0fcd6c61e235d0b84122d16bd84387c3e66ed0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>