| commit | b4339e42bb8454f14285084186fdfcd01ee99afd | [log] [tgz] |
|---|---|---|
| author | Raphael Kim <raphk@google.com> | Tue Sep 26 21:33:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 21:33:44 2023 +0000 |
| tree | 49dab6ff1b26c720e9892225d96c9e5b80b68dfc | |
| parent | 9fa75957e30acf8af762c6f52016bb171ef7cf22 [diff] | |
| parent | 3091bc0643e641f051cd4446452deeb766a94c1d [diff] |
Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future am: ffc308aab8 am: 12db897275 am: 6cfbd96e49 am: 3091bc0643 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24827551 Change-Id: I82f6c9ce78d81126ec9e2c80eb8a6c7a358f11f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>