summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2022-02-25 04:47:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-02-25 04:47:34 +0000
commit6cbad8cff964b0e9d0d6c102bdad75f8a6487cb6 (patch)
treef83b92437bde213260c3dacb6b5006ef24a27436 /libs/androidfw/StringPool.cpp
parenta6ef764340796a929792d270e099ead23418d6b1 (diff)
parentbce5c8c99a695e69de360318e07310898d088b16 (diff)
Merge changes from topic "testDelegatedCertInstallerDeviceIdAttestation" into sc-v2-dev-plus-aosp
* changes: [automerge] Allows DPM.generateKeyPair() to be called from PO of affiliated user. 2p: e8caa07e9f Allows DPM.generateKeyPair() to be called from PO of affiliated user.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions