OSDN Git Service

Merge "libfscrypt: support setting v2 encryption policies" am: c5f7c38480 am: b202edbfa2
authorEric Biggers <ebiggers@google.com>
Mon, 7 Oct 2019 19:40:44 +0000 (12:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Oct 2019 19:40:44 +0000 (12:40 -0700)
commitafe051ac24c36375194a3eb80289cdec849ca0a4
tree9290ad25770079f002272240383d5815f3f17bca
parentfe8a9f32ea5e4be7fa651cdf23d7fe4805ee5506
parentbfd2c0507976db7f7a06b1aaebbeb177abc62227
Merge "libfscrypt: support setting v2 encryption policies" am: c5f7c38480 am: b202edbfa2
am: bfd2c05079

Change-Id: I38804507a4bf13c8d9d1ed663d109767474bbf5c