Aran Ink 43369ea648 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev ...

am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1

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

..

java

Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5

2019-06-21 13:52:40 -07:00

jni

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

2019-06-14 17:26:07 -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

2019-06-18 10:52:04 -07:00

xsd

…