tree 5dd2abe8b4b139cc049661b27fa00d8abf594c2b
parent 10b70834a4ad2e6ddaa62f975f9197cc637bd27a
parent ddbd8325f53a29200d512e018d0a456cb0942ead
author Eric Biggers <ebiggers@google.com> 1540834377 -0700
committer android-build-merger <android-build-merger@google.com> 1540834377 -0700

Merge changes from topic "e4crypt_to_fscrypt"
am: ddbd8325f5

Change-Id: Ifbe5a1bfd2d9a4b0e97197ab91358df356b0d0b2