Skip to content
Commit 13539f79 authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata... 

[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am: dde97046 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e80 is in history

Change-Id: I11c77206000895c27aee9ad8326778ec95e233df
parents 4ad86a93 dde97046
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment