OSDN Git Service

am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck"
authorMohamad Ayyash <mkayyash@google.com>
Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)
commit19324304f363a55ccdb962e7b95a4e8bb693968d
tree9b5f4b220260c248b0188356689c1b0f362b2fea
parent88b0df1efca70e9906a8f49c1074ccf319e11ff1
parentd7da78a6e99e85783d5965cd947e9cc7338e9e37
am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption support to e2fsck"

* commit 'd7da78a6e99e85783d5965cd947e9cc7338e9e37':