Automerger Merge Worker 64fdcebb5f Merge changes Icb062ffb,I66c4e8f5,I85247411,Id47c19b7,Ib713c4ae, ... am: 0b32981970 am: 5f603929da am: 699cea6988 ...

Change-Id: I213d2cdca4187ed30293dc433cfee9e8af782b6e

2020-02-04 13:48:46 +00:00

..

java

Merge changes Icb062ffb,I66c4e8f5,I85247411,Id47c19b7,Ib713c4ae, ... am: 0b32981970 am: 5f603929da am: 699cea6988

2020-02-04 13:48:46 +00:00

jni

Merge "Adapt SurfaceControl to libgui API for display info"

2020-02-03 22:29:43 +00:00

proto

Merge "Update mapping for the rat type in data stall proto" am: e372df0b69

2020-02-04 08:25:10 +00:00

res

Merge "Multiple shortcut menu for android R (9/n)."

2020-02-04 11:43:02 +00:00

tests

Use FrameworkStatsLog instead of StatsLog

2020-02-03 09:17:40 -08:00

xsd

…

TEST_MAPPING

…