[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664 -s ours

Browse Source

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

Change-Id: I0ed87e8107d4007c42545397d2cb03628527671a

gugelfrei

Paul Lawrence 5 years ago committed by android-build-merger

parent 4f4c7263ea 13539f79f5

commit 125e79e344

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

Diff Content Not Available