| commit | b4b2895a994631ace609b61e1e1acadea3af79fd | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:22:52 2015 -0800 |
| committer | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:22:52 2015 -0800 |
| tree | 5fd27f3b98f622f138200c05705d1d58bc98d8a9 | |
| parent | b2cc45fe711dc42c8c0444584b2513ac59b3ad3b [diff] | |
| parent | 07a7be75a7442ef6c6e84f12492382a4d8aeb735 [diff] |
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