OSDN Git Service

[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encrypt...
authorPaul Lawrence <paullawrence@google.com>
Fri, 28 Jun 2019 22:07:54 +0000 (15:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jun 2019 22:07:54 +0000 (15:07 -0700)
am: 7d43cb0ae9 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e800e is in history

Change-Id: I2b29a01279fcd03f35a17156d5eafc42ce510980


Trivial merge