[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664
-s ours am: 13539f79f5
-s ours
am:gugelfrei125e79e344
-s ours am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1236e5e800e
is in history Change-Id: I27f743c943364f372261d7a6aa93d9dfbf2ae634
commit
7e52fcff1e