summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-06 00:08:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 00:08:33 +0000
commitfaea688b16e895ce1289436bd7710f5d09df9e40 (patch)
treef87b78cd70caa89a0324858ae18f4a631325b77a /tools/aapt/ResourceTable.cpp
parenta7fd5f6515a660629ca2ded7e5b284d806dd5a08 (diff)
parentd92dacc7eb3e3eb1f5611583abb2e4c522d4b789 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: 25b8fa5e7d -s ours am: d92dacc7eb -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 dd044a6cad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I1de31d45f555461d7463d291fdfc02126ba0d3d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions