Lucas Dupin 1a921a5f27 Merge "Cross fade wake-up from pulsing" into pi-dev am: 42e713d7a3 ...

am: 6af28886e3

Change-Id: I5d0f8cff0718fa2537ba7c4199347b3f0275952f

2018-07-03 12:37:53 -07:00

..

java

Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2"

2018-07-03 17:42:25 +00:00

jni

Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev am: fb11e4c9b1

2018-07-03 12:17:00 -07:00

proto

Merge "6/n: Have FaceService extend BiometricService"

2018-06-27 22:09:01 +00:00

res

Merge "Cross fade wake-up from pulsing" into pi-dev am: 42e713d7a3

2018-07-03 12:37:53 -07:00

tests

Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2"

2018-07-03 17:42:25 +00:00