OSDN Git Service

Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
authorTom Cherry <tomcherry@google.com>
Fri, 31 Mar 2017 16:47:41 +0000 (16:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 16:47:41 +0000 (16:47 +0000)
commitb110b5450e1bc01bb97188a864551909622df102
tree5fe58bdeea1841181a9e3a1e4b22be7755fbc173
parentfcc14632bda26a5c1edbb822b5417e9ffabf4a73
parentad48884579b86b65ff97ca62055051ecba6a2a32
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
am: ad48884579

Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3
ext4_utils/ext4_crypt_init_extensions.cpp