Alan Viverette 0c92eea176 Merge "Migrate multidex to androidx" into pi-dev ...

am: b5837d14c2

Change-Id: I9d1193b1387c6160daa57fd1f4c2812b3bf63824

2018-03-13 00:32:45 +00:00

..

java

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

2018-03-12 23:45:20 +00:00

jni

Merge "Zygote: Set libbase default tag on fork" into pi-dev

2018-03-10 03:09:52 +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

2018-03-12 23:45:20 +00:00

tests

Merge "Migrate multidex to androidx" into pi-dev

2018-03-12 23:15:51 +00:00