Ethan Yonker 58f2132bc3 Merge AOSP android-9.0.0_r3 ...

Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4

2018-08-24 11:17:39 -05:00

..

ext4crypt

Merge AOSP android-9.0.0_r3

2018-08-24 11:17:39 -05:00

lollipop

Merge AOSP android-9.0.0_r3

2018-08-24 11:17:39 -05:00

scrypt

Merge AOSP android-9.0.0_r3

2018-08-24 11:17:39 -05:00

vold_decrypt

TWRP: vold_crypto: Allow custom strace path

2018-05-25 18:24:09 +02:00