tree 5dd2abe8b4b139cc049661b27fa00d8abf594c2b
parent a51283d2816f2d537c13bf77655b9eed0c3bf7a4
parent e6680f17a8f4dc2295f11b5a5ce2cf3951128533
author Eric Biggers <ebiggers@google.com> 1540834617 -0700
committer android-build-merger <android-build-merger@google.com> 1540834617 -0700

Merge changes from topic "e4crypt_to_fscrypt" am: ddbd8325f5
am: e6680f17a8

Change-Id: Ie093f99065ac99b31ab92910b5618473057c07e2