summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2022-02-25 05:21:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-25 05:21:44 +0000
commitca7027e774544611b23e33eac3f2882e122cfc82 (patch)
tree255dda087b1168f18f45b86544fd10185b5831b5 /libs/androidfw/StringPool.cpp
parentdef235492ca4579e52099fad0d05a656e72bb119 (diff)
parenteee9fa67cf53d3e010942a227a097fed7cb74d3c (diff)
Merge "Allows DPM.generateKeyPair() to be called from PO of affiliated user." into sc-v2-dev am: 4459afb810 am: eee9fa67cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873887 Change-Id: Ia78b84068b51ed430ab4663d08433dcb5cbdb86d
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions