From: Paul Lawrence Date: Wed, 29 Apr 2015 16:24:38 +0000 (+0000) Subject: Merge "Securely encrypt the master key" X-Git-Tag: android-x86-7.1-r1~191^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3e4cc29f8ba2770de29e510444c9636e2aca624;p=android-x86%2Fsystem-vold.git Merge "Securely encrypt the master key" --- c3e4cc29f8ba2770de29e510444c9636e2aca624