tree 9e92985094a3946cda872b4d1c19f3ba61e76db6
parent 1c4f1e80e0a2fd5807b17ebdde217ecc4c261bd2
parent 3a38070bbfd16875b4f767297becc43dde198913
author Chris Fries <cfries@google.com> 1552578008 -0700
committer android-build-merger <android-build-merger@google.com> 1552578008 -0700

Merge "Fsync directories before delete key" am: 7573874d3f
am: 3a38070bbf

Change-Id: I568a6e8a39929b77ba76b021657e248a4e49e470