lpeter d62e8f174f Merge "[IdleController] Support dock scenario on idle or active judgement" into pi-dev am: 86b2581c16 ...

am: 2fdc1b8b13

Change-Id: I0d6e38e4cc8a7f24874956a1382f476c8021e838

2018-05-16 20:27:18 -07:00

..

java

Merge "[IdleController] Support dock scenario on idle or active judgement" into pi-dev am: 86b2581c16

2018-05-16 20:27:18 -07:00

jni

Merge "Add support for manually set surround formats." into pi-dev am: eddc0d712c

2018-05-15 14:51:25 -07:00

proto

Merge "Remove ro.retaildemo.video_path from proto"

2018-05-17 01:08:35 +00:00

res

Merge "[IdleController] Support dock scenario on idle or active judgement" into pi-dev am: 86b2581c16

2018-05-16 20:27:18 -07:00

tests

Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576 am: 1d9a9610ae

2018-05-16 14:31:31 -07:00