diff options
| author | 2020-09-30 18:46:41 +0000 | |
|---|---|---|
| committer | 2020-09-30 18:46:41 +0000 | |
| commit | b6f4f5a2ab6d8196502584a50aa54983cb3a6ef4 (patch) | |
| tree | 2534e89b103d2b360b65234ed863614ca1b568eb /scripts/lint_project_xml.py | |
| parent | f6de879545f9a4b209faa8c41a19034d0e29b033 (diff) | |
| parent | d6f7bf5069ea8e255e11cd600c677fafe5ab1b56 (diff) | |
resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to rvc-dev am: 68805280f0 am: d6f7bf5069
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12730519
Change-Id: If3b9521ab940e4060b13ef1c3b96b2de5ea684a8
Diffstat (limited to 'scripts/lint_project_xml.py')
0 files changed, 0 insertions, 0 deletions