Robert Snoeberger c96503773c Merge "Handle case that settings string is JSON" into qt-r1-dev am: 6060068d5a ...

am: be57a19313

Change-Id: I2a4db0e323272f36c1d8d1b9f50238ca0aa073f0

2019-06-21 10:43:48 -07:00

..

java

Merge "Handle case that settings string is JSON" into qt-r1-dev am: 6060068d5a

2019-06-21 10:43:48 -07:00

jni

Merge "Allow LayoutLibLoader customization."

2019-06-19 16:30:32 +00:00

proto

Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev am: 41d0b1abc8 am: 29c3068cb4

2019-06-20 09:10:41 -07:00

res

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

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

tests

Merge "Moar SystemServer boot timing improvements:"

2019-06-19 04:49:24 +00:00

xsd

…