OSDN Git Service

resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sat, 13 May 2017 00:43:09 +0000 (17:43 -0700)
committerElliott Hughes <enh@google.com>
Sat, 13 May 2017 00:43:09 +0000 (17:43 -0700)
commitbd2d5da516763b38d06126439e883f309ca6656a
treeb131f3b4bd5be5e71237271d21c9262eafd594fd
parent538e31abb5b1b0b8f313a8fc6be24df009ff77b5
parentd38ce6ce7c9fc00a21422defb2949760611451e5
resolve merge conflicts of d38ce6ce to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I589f393be9d6ce0cf76afbd39d8e28d3fb6046d9
ext4_utils/ext4_crypt_init_extensions.cpp