diff options
| author | Patrice Arruda <patricearruda@google.com> | 2020-10-15 23:56:42 +0000 |
|---|---|---|
| committer | Patrice Arruda <patricearruda@google.com> | 2020-10-19 18:09:54 +0000 |
| commit | a24c3479a8842d8c4cab040e2fb5d2b597fcae86 (patch) | |
| tree | 4dee7303a262e578d64d32d171aee91c7a316c2e /scripts/lint-project-xml.py | |
| parent | 925c9f2983eba32d70180a61c4a6e08289025a4f (diff) | |
| parent | e32b3847191e36891849c6fce8d21a718a0fd5b7 (diff) | |
resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 to rvc-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: b/169395325
Change-Id: Iaac2f8ef4b452c95bdc4584697c3e4e9ed69aa5c
Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76
Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
Diffstat (limited to 'scripts/lint-project-xml.py')
0 files changed, 0 insertions, 0 deletions