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

Browse Source

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml

...

This commit is contained in:

董宏宇

2020-09-16 16:44:55 +08:00

parent cb35854b49 d423a6dc07

commit 2f57b905bb

23 changed files with 68 additions and 59 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/loading_image.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 144 KiB