Remi NGUYEN VAN f6509edebb resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie9aab5e1d786f32d219a66dd7184a9209c684eeb

2018-05-18 14:24:09 +09:00

..

java

Merge changes Ieb0a5d24,I44df6668

2018-05-17 20:40:35 -07:00

jni

Merge "AnimatedImageDrawable: Eliminate unnecessary calls to redraw" into pi-dev

2018-05-17 13:06:32 -07:00

proto

Switch the setting for Off Body Radios Off to User Absent Radios Off

2018-05-09 21:11:44 -07:00

res

Merge "Fix lockdown icon dark mode coloring." into pi-dev

2018-05-17 12:10:56 -07:00

tests

resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp

2018-05-18 14:24:09 +09:00