summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2021-07-22 08:08:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-07-22 08:08:31 +0000
commitcbdab101e1d44fbf8a580575f3bea298e2dac21d (patch)
tree20ee4facf9f9852cde4ba6320e14c6de2b1a01c7 /tools/aapt2/ResourceParser.cpp
parent66e2d05553b8e6aa8c79274423cfbf908714db5f (diff)
parentb3abf5cb7b8b3b032ef0d99dd82f9dd5660b895b (diff)
Merge "RESTRICT AUTOMERGE Restart recognition when failing to deliver event" into sc-v2-dev am: b3abf5cb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337429 Change-Id: I8b5b894d6e3995e6dda932b5dc38f430225315c0
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions