diff options
author | Kousik Kumar <kousikk@google.com> | 2021-08-06 15:45:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-06 15:45:38 +0000 |
commit | 4d645c779101c753b33ec71ceb8b6cea6ce0357e (patch) | |
tree | 28afc98fa023f15069b31eacbf56a8d9cd8d4cd0 /scripts/lint_project_xml.py | |
parent | e992416430fcf0d6d5f5ad36b02a51cfaddb439c (diff) | |
parent | 3c125769425395389fbacb022fa9fac23a0f5191 (diff) |
resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to rvc-dev am: 3c12576942
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760
Change-Id: I2168fdd669b5ea1b73fce690609be8293fd9069a
Diffstat (limited to 'scripts/lint_project_xml.py')
0 files changed, 0 insertions, 0 deletions