summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-03 13:44:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-03 13:44:35 +0000
commit394fc3acc3e60e482ed7db724b0422237052dfc1 (patch)
tree1b08d1df341d2e03dc55403958d4f32bcb15f8b3 /tools/aapt2/ResourceParser.cpp
parent0b64f162bdc02011e391f6a393317ae2a44a74b1 (diff)
parent44cb7f80802b01d54fad78811a5fee473aaeb9e1 (diff)
Merge "Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 am: e3bcc4a895" into sc-v2-dev-plus-aosp am: 44cb7f8080
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896 Change-Id: I65a2fd3422c18f0d5db4fd7b72d75605369bcf7e
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions