commit | ca2f3aa268617a57cb8d9febd7aafdac035941d3 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Fri Jun 28 18:15:53 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 28 18:15:53 2019 -0700 |
tree | b52ab1054a3361efdd496d85baf3d36c0e39060e | |
parent | b1b35cf5d858466ba13eec8aee62b88990e15403 [diff] | |
parent | 39a0ecec18da672f092b7de390e57a93a82ba6df [diff] |
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664 am: 7d43cb0ae9 -s ours am: 39a0ecec18 -s ours am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e800e is in history Change-Id: I2596b55b73e6eb969fa9b8c596acf0329c36ac52