Kevin Chyn a65c11d041 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev am: 54926ba6a9 ...

am: 8566a544c6

Change-Id: I881dcdd4a1da08173e74f5b831c716decf21c752

2018-04-17 19:19:24 -07:00

..

java

Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev am: 54926ba6a9

2018-04-17 19:19:24 -07:00

jni

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

2018-04-16 23:15:47 -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 am: 17b2f5d427

2018-04-17 11:21:33 -07:00

tests

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

2018-04-17 16:13:29 -07:00