tree 669d628efe0fb28e004ff50d881c71454e85bd82
parent ca09c0b55e14d74d405892141c90b4da255997d7
parent 55df4d90f0b2cbbb76c7ca25e9698e26d8dcf398
author Tom Cherry <tomcherry@google.com> 1493850646 +0000
committer android-build-merger <android-build-merger@google.com> 1493850646 +0000

Merge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2 am: 52cdeee3d1
am: 55df4d90f0

Change-Id: Ib5147e8b535977c40daa6ba1d3281aed7b7bd8c9