OSDN Git Service

am ae2fb8b7: am f65354a9: Merge "Add bare-bones encryption support to e2fsck"
authorMohamad Ayyash <mkayyash@google.com>
Thu, 16 Jul 2015 19:49:33 +0000 (19:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jul 2015 19:49:33 +0000 (19:49 +0000)
* commit 'ae2fb8b71d5dcee8da6444cf6a430c6d4c57ec8a':
  Add bare-bones encryption support to e2fsck


Trivial merge