summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2021-07-22 08:28:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-07-22 08:28:12 +0000
commit9a600fd161069a254a7f734f56036e0d80339048 (patch)
tree8c0e5ce02a7ef5a5fa088ddd13f21d45b1eddb7b /tools/aapt2/ResourceParser.cpp
parent264f24c8d746b86e9623b3862e393846ed90a57b (diff)
parentc85b6716a3ff6ef77762e18c16e77fb81fe63105 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Restart recognition when failing to deliver event" into sc-dev am: 43993b70c4 am: c85b6716a3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325120 Change-Id: I89ef38724e978ad4572ddf7316c8d5aba6a32eaa
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions