Merge remote-tracking branch 'origin/dev' into dev

Browse Source

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml

...

This commit is contained in:

董宏宇

2020-11-03 13:37:05 +08:00

parent f6473a8d31 f81dff0329

commit 80f51fa5d1

237 changed files with 3 additions and 8032 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_video_close.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_video_close.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_video_close.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB