diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-08-06 16:03:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-06 16:03:42 +0000 |
| commit | e8d959e5cf504199e4e138604657ae916bcdcd47 (patch) | |
| tree | 56eef1e4f6691bdc81b5583206356dcc0c342320 /python/python_test.go | |
| parent | e6cc66da0e20482c2acd223056c78f62aa8b011f (diff) | |
| parent | 4d645c779101c753b33ec71ceb8b6cea6ce0357e (diff) | |
resolve merge conflicts of 233c1be0bdf85ae4dce75cd79ab04932be22af5b to rvc-dev am: 3c12576942 am: 4d645c7791
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760
Change-Id: I5568c2f0fed211356a521bed0e26332e930bd22b
Diffstat (limited to 'python/python_test.go')
0 files changed, 0 insertions, 0 deletions