Lorenzo Colitti 7f0087be48 Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: c48f4cb7f1 am: b36b423230 ...

am: cfbf873dd1

Change-Id: I12108d96e29bfe71406106c2af950a6d6a9f8351

2018-01-19 16:46:11 +00:00

..

java

Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: c48f4cb7f1 am: b36b423230

2018-01-19 16:46:11 +00:00

jni

Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: c48f4cb7f1 am: b36b423230

2018-01-19 16:46:11 +00:00

proto/android

Merge "Revert "Add setting/experiment for small battery devices to have""

2018-01-18 23:10:54 +00:00

res

Merge "DisplayCutout: device-independent emulation overlay"

2018-01-19 14:42:13 +00:00

tests

Merge "Add validators for all Settings.Global settings that are backed up"

2018-01-19 11:44:13 +00:00