summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2022-04-25 15:53:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 15:53:56 +0000
commit101b3209f003bbdd11a4c4980400891892405cf9 (patch)
tree2761891e2be8ec9b7d0a8f062fe09910e87d4ae2 /libs/androidfw/StringPool.cpp
parent378d4f20e5260de850916aa0eff4df5f981604e2 (diff)
parenta1d0678127d323bbe73e4250dfaabf3a546a514a (diff)
Merge ""Revert "Temporarily exclude Launcher from sandboxing; to be reverted once""" into tm-dev am: 6d4b050f10 am: e48926c4b2 am: 55dc3637ab am: a1d0678127
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17471384 Change-Id: Iddd7871e2ed9154dd4f0547b770cc0b4156a5307 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