diff options
| author | Patrice Arruda <patricearruda@google.com> | 2020-09-30 23:17:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-30 23:17:15 +0000 |
| commit | 5b9765037de1382c2b4ded8c94ee4b810c0b5b1e (patch) | |
| tree | 813968579010f070c83bcc9c290bb9042a515b77 /scripts/lint-project-xml.py | |
| parent | b6f4f5a2ab6d8196502584a50aa54983cb3a6ef4 (diff) | |
| parent | db8dd5e17d0791af48cddda02344d53f9b1b89f3 (diff) | |
resolve merge conflicts of 87deed46bf3693f0fb0a63b9da0b863af6bd9177 to rvc-dev am: 925c9f2983 am: db8dd5e17d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12736108
Change-Id: I6dca5e284e200caaf1ec683aad5c22a5315fc20d
Diffstat (limited to 'scripts/lint-project-xml.py')
0 files changed, 0 insertions, 0 deletions