OSDN Git Service

Merge changes from topic "e4crypt_to_fscrypt" am: b27fec0d91 am: 34699fc75b
authorEric Biggers <ebiggers@google.com>
Mon, 29 Oct 2018 17:40:53 +0000 (10:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Oct 2018 17:40:53 +0000 (10:40 -0700)
am: 87d7d8bf1c

Change-Id: I34808b4d79207553736a5bc1c82db40a428db76d


Trivial merge