Andreas Gampe 4fc0de746f Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5 am: e4a6ca7231 ...

am: 89e543fe54

Change-Id: I2ac4405b4dc67edbda8dd94b877b4c7724d34509

2019-06-21 14:05:31 -07:00

..

java

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

2019-06-21 14:05:31 -07:00

jni

Merge "Allow LayoutLibLoader customization."

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

proto

Fix conflict between metrics_constants and settings_enums.

2019-06-21 10:42:14 -04: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

…