tree 4852a6add7492bf8f5be586692d9598b02810af6
parent d217940357fdc2296e3a0bf16b396bb52040c2c1
parent e0fb874ea88921632af9d35104a87c409a650c40
author Greg Kaiser <gkaiser@google.com> 1544592260 -0800
committer android-build-merger <android-build-merger@google.com> 1544592260 -0800

Merge "libfscrypt: Add Adiantum support" am: 8f6cd07cb6
am: e0fb874ea8

Change-Id: I7ae4bc2bea0dac7f66f2c39a35d0e22f2531558e