[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev

Browse source

am: dde9704664 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e800e is in history

Change-Id: I11c77206000895c27aee9ad8326778ec95e233df

...

This commit is contained in:

Paul Lawrence 2019-06-27 16:25:58 -07:00 committed by android-build-merger

parent 4ad86a9315 dde9704664

commit 13539f79f5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available