summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Michael Groover <mpgroover@google.com> 2024-10-18 21:23:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-18 21:23:04 +0000
commit670fd8e2fee856481a7edc248d0cbbb91de65ea0 (patch)
treecf6d489cde196e0fcf8a561787a22bdf00849f89 /libs/androidfw/StringPool.cpp
parent3d14df65ebd9e776461b7b30ca3a1bd63dce3180 (diff)
parent2966392dc171a1a690acfc2be5cfa135d5c572b7 (diff)
Merge "Add APIs to support granting access to Android Keystore keys" into main am: 64477772c8 am: 2966392dc1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3287077 Change-Id: I6011f38cc534260216e192705dd8e97a189d9cd0 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