OSDN Git Service

Merge changes from topic "fscrypt-key-mgmt-improvements"
authorEric Biggers <ebiggers@google.com>
Mon, 7 Oct 2019 19:27:17 +0000 (12:27 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Oct 2019 19:27:17 +0000 (12:27 -0700)
commitde5c9ad178635593079dc3c0d65f0d98199f68aa
tree7ce919c03db8667423aa5d281de6f34deb596342
parent12a9212ac102893f6ff4291e5aa024030cbf7682
parent22d50012b0c8b39f02e3a4ce834cbbfde63e15d8
Merge changes from topic "fscrypt-key-mgmt-improvements"
am: 22d50012b0

Change-Id: I97a1990aa2f0bdaf2a622555774b737bfc6d26ab