tree 6049df9819b50665c9576ac0eae95736218abdd7
parent 20f83f47677fc8bf73e5b18617ac208ecc918f35
parent 419875e8e563fdff5c5c66627c08a28ff24cdbce
author Wei Wang <wvw@google.com> 1485367117 +0000
committer android-build-merger <android-build-merger@google.com> 1485367117 +0000

Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions" am: 537783ad78 am: 6d83bb3c82
am: 419875e8e5

Change-Id: Idd86206479af8e4cf95f93e6e284c145f7d20b59