summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2022-04-26 15:43:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-26 15:43:12 +0000
commitbcfc2b3761cba359fc453cef5745839c914a4adf (patch)
treef2001fd17e5cf5bc244365becf40292453a00994 /libs/androidfw/StringPool.cpp
parent096c9b7c09c2c1a8b4ff23977ea056eaedda7585 (diff)
parent9736fb2a2bc642c216f198eb4ac26cd3a3a0c05b (diff)
Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev am: 9736fb2a2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822403 Change-Id: I61b64ff0916ad98ccfe665b1a95975c0ac90988f Ignore-AOSP-First: this is an automerge 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