tree a633cae58f717b34b6929b5e683be7b13f52df3a
parent 95e7cabd9feb6d6b4b849570cfd1209831577367
parent 24c2c60951aa37e080786518f7358c86e925fc59
author Victor Hsieh <victorhsieh@google.com> 1568856863 -0700
committer android-build-merger <android-build-merger@google.com> 1568856863 -0700

Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7 am: 1863e70b22
am: 24c2c60951

Change-Id: Ia8e7e81bda8ea2d7b71d9790b2a9a69f9f84fd4a