summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2022-06-27 17:36:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-27 17:36:11 +0000
commit9e339979e1039a7f748e2812f7523664bea6c50b (patch)
tree32d0bf8e9a463eacccb7879b05df9fca3ca54c58 /libs/androidfw/StringPool.cpp
parentf3cf657e09a8347a1baef6b4ce7b9e4853c9ee96 (diff)
parentb089c8aaf372d9a6375c516fd7f105f1c8232cef (diff)
Merge "SyntheticPasswordManager: rename derivePassword() to deriveSubkey()" am: a2f9e65a02 am: 0573cdeafc am: b089c8aaf3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132301 Change-Id: I235d550a2d66c7868446bb3eefff98d1c580b032 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions