summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Jack Yu <jackyu@google.com> 2022-03-04 02:44:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-04 02:44:13 +0000
commitbf9e179e5fb06b7398538235c997e7b7b99df30c (patch)
treede96401ddd7f95cfa8df11eea0601f336817212c /tools/aapt2/ResourceParser.cpp
parent2b428281cdc859496aa5a1f6103095722dd1bdd9 (diff)
parent42946d3ac9acc8e5e291909b3d520081fa6f2a82 (diff)
[automerger skipped] Added data retry support am: 5169d5c222 -s ours am: 42946d3ac9 -s ours
am skip reason: Merged-In I04cadac100040054d449892df50e30dc77954082 with SHA-1 613ed789de is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005015 Change-Id: I727708c3b84add40d0a3d2037c681236fd585843
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions