tree 5fd27f3b98f622f138200c05705d1d58bc98d8a9
parent b2cc45fe711dc42c8c0444584b2513ac59b3ad3b
parent 07a7be75a7442ef6c6e84f12492382a4d8aeb735
author Divya Sharma <c_shard@codeaurora.org> 1446657772 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657772 -0800
mergetag object 07a7be75a7442ef6c6e84f12492382a4d8aeb735
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052345 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfkACgkQ6K0/gZqxDnh1jwCfdOiaNljaoWFHEmf7pV+D0T4j
 WJwAniLIKqyGvfIQRErrTKhWcqMKjwVr
 =iAW4
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Add bare-bones encryption support to e2fsck

Change-Id: I9b6165585831cb4efc00d947376e779367298072