[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664
am:gugelfrei7d43cb0ae9
-s ours am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1236e5e800e
is in history Change-Id: I2b29a01279fcd03f35a17156d5eafc42ce510980
commit
39a0ecec18