summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2022-06-27 17:12:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-27 17:12:21 +0000
commitb089c8aaf372d9a6375c516fd7f105f1c8232cef (patch)
tree66ffde28a19dc78b534e99bb959b66bb39de6246 /libs/androidfw/StringPool.cpp
parent157a1a626806f45999845a3a06aa8f6aeab420a3 (diff)
parent0573cdeafc5d80c36ae11fb33b4c42d3092ebcc1 (diff)
Merge "SyntheticPasswordManager: rename derivePassword() to deriveSubkey()" am: a2f9e65a02 am: 0573cdeafc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132301 Change-Id: I864277332a29ce8e8df0f25eaf2243b66d726013 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