OSDN Git Service

Merge "libfscrypt: support setting v2 encryption policies" am: c5f7c38480
authorEric Biggers <ebiggers@google.com>
Mon, 7 Oct 2019 19:33:45 +0000 (12:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Oct 2019 19:33:45 +0000 (12:33 -0700)
commitbfd2c0507976db7f7a06b1aaebbeb177abc62227
tree9290ad25770079f002272240383d5815f3f17bca
parent6a6ebe3500d45021b39e7205d4f897abdb5efa81
parentb202edbfa27ec32e0f1fc1ee4e7673d5d816a963
Merge "libfscrypt: support setting v2 encryption policies" am: c5f7c38480
am: b202edbfa2

Change-Id: I039ed787a38cf4844cdc81c66d44b149de064d0b