Kevin Chyn 8566a544c6 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev ...

am: 54926ba6a9

Change-Id: I151f4f09e2de5c7999b0ed13afa7b712781d468f

2018-04-17 19:10:20 -07:00

..

java

Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev

2018-04-17 19:10:20 -07:00

jni

Merge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev

2018-04-16 23:06:04 -07:00

proto

Merge "Enforce dump permission in stats service" into pi-dev

2018-04-17 01:34:47 +00:00

res

Merge "String update for effect suppressors" into pi-dev

2018-04-17 10:50:47 -07:00

tests

Merge "Add Global Settings to device whether show Carrier menu" into pi-dev

2018-04-17 15:46:07 -07:00