TreeHugger Robot 7e5f2498f9 Merge "Import translations. DO NOT MERGE" into qt-r1-dev

2019-06-24 14:23:19 +00:00

..

java

Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev

2019-06-24 03:37:23 +00:00

jni

Merge "Zygote: do not preload Vulkan driver in Q" into qt-dev

2019-06-14 17:29:40 -07:00

proto

Fix conflict between metrics_constants and settings_enums.

2019-06-21 19:36:20 +00:00

res

Import translations. DO NOT MERGE

2019-06-24 03:14:08 -07:00

tests

Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""

2019-06-21 01:09:49 +00:00

xsd

…