OSDN Git Service

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03
authorEric Biggers <ebiggers@google.com>
Fri, 17 Jul 2020 01:50:07 +0000 (01:50 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 17 Jul 2020 01:50:07 +0000 (01:50 +0000)
commit6b36554b385820665826e51831b277cc0810f240
tree7818fc6eb2b7e2c800739ff8962482fee64dea67
parent4cd238b900ae594d335d08d465661bf3dae62f41
parent83a3eecc035b23cf4f817113d33d94cef9cf8753
Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: Iffa50e4c549469de6425134369e609856f1d7813