OSDN Git Service

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am...
authorEric Biggers <ebiggers@google.com>
Fri, 17 Jul 2020 02:17:40 +0000 (02:17 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 17 Jul 2020 02:17:40 +0000 (02:17 +0000)
commite0ffab6cb4c0f15260854df2434a01467b93d1b3
tree7818fc6eb2b7e2c800739ff8962482fee64dea67
parent02c65ccdc68b484f1684bf01752b51ff346f665a
parentcb640677a74b3e6c084c302b12f856014d898015
Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38 am: cb640677a7

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

Change-Id: Ie7df8fc2c5582ad23db0663d33014f86555edc1c