Aran Ink 49a40df62a Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 ...

am: 43369ea648

Change-Id: I7ae7a7d7d4ad2ea593ef01c6ed03bd161b5d5d0b

2019-06-21 15:27:42 -07:00

..

java

Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5

2019-06-21 13:57:26 -07:00

jni

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

2019-06-14 17:37:12 -07:00

proto

Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev

2019-06-21 15:18:29 -07:00

res

Merge "Replace no_framework_libs: true with sdk_version: "core_platform""

2019-06-20 07:42:13 +00:00

tests

Merge "Log usage of addPerson() and setStyle() in notifications." into qt-dev am: 029190c1bc

2019-06-18 11:01:51 -07:00

xsd

…