Alan Viverette 8310fd3941 Merge "Migrate multidex to androidx" into pi-dev am: b5837d14c2 ...

am: 0c92eea176

Change-Id: I70622bfc32b2ef3f8001840cd22e626e652ef146

2018-03-13 02:42:56 +00:00

..

java

Merge "DisplayCutout: Support more than one cutout" into pi-dev am: 5d92e72482

2018-03-13 02:18:14 +00:00

jni

Merge "Move display id into MotionEvent"

2018-03-12 18:02:43 +00:00

proto

Merge "Using zen duration preference" into pi-dev

2018-03-12 21:39:18 +00:00

res

Merge "DisplayCutout: Support more than one cutout" into pi-dev am: 5d92e72482

2018-03-13 02:18:14 +00:00

tests

Merge "Migrate multidex to androidx" into pi-dev am: b5837d14c2

2018-03-13 02:42:56 +00:00