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

am: 985f21dd43

Change-Id: I9e279d5ccae2ce43a30e217bccd34df3a200285e

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

..

java

Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev

2019-06-21 11:15:06 -07: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

Merge "Correct value of supported keepalive count for cellular" into qt-dev

2019-06-19 22:54:45 -07:00

tests

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

2019-06-18 10:48:27 -07:00

xsd

…