tree dd9cd75d76d465a4371310bc1f89ae553045a84e
parent f14a3c0ba8928c0220004e710df4ca9ec9e7c520
author Pig <pig.priv@gmail.com> 1601045793 +0800
committer Michael Bestas <mkbestas@lineageos.org> 1661207110 +0300
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmMEAkYXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlVhg//Z/8PXDs9DVYxy98ZO5ndskPq
 T1BMas+zleI44BIEicundqua4vlMDF7zoImHiIahjPpafW+rGWQKIFMf44YNI8ZU
 1znYUGOj56q6CeseAleX2xTPEpTFS6pxX0dNDE0LePHAQyQ5ifmp6jx0R+B3ZiPm
 P3WE8akiNxxgZo2W1rPQZV54QWNqpTA/3QFEjROi7iyJ/tNhkAJOIaXJUja/Pi+n
 Yq0Zf73Q/wEnhZj5MeHO/bK6yBb8P4ksSbmiojzxgqJK8HURa3PjSxngN81acXln
 4N3uIgydv0Vdr/SJGiytBMdKzWf/Xb9yZzTTF2x4NR2FwQiPWEocDLdD6Seo9CMT
 WvKSBoX2AaFOyYu8swGg6bhHGijo12fnlOENtkhzH2LxWAWpEy2zBTcCD5WIv3tF
 5NfdjLvpVjDiFrqAszYg9tHVVLafx0QIt1kV0Zewwbg+EkaO808xR3Rhrx8Voao4
 ucbOqeM8UL/l6GWM6/m83IVzUp5rLfWeVfgG7bS4yO55VJrCXUn9RwRQZRjlf+ca
 eNe6ZDyh99BJuIYJaQ0szeYPPMKDfnLEVmyspa1AsOwThSSnqws/NLLRIzNHiTCo
 I9/PJl1Vd6oujL8n8bDdgwWNW2MlcZkxIvXTZ91h6pbFT8KeLDHc9wZeQTbYzwgk
 Me3uLBxnWzCqCau92zg=
 =MiZE
 -----END PGP SIGNATURE-----

vold: Bring in more wrapped key changes

Conflicts:
	KeyStorage.cpp
	KeyUtil.cpp

[wight554: Apply changes from CAF 12]

Change-Id: I44e81afaec78c567a0bf2eed30a79eb737e2a867
Signed-off-by: Volodymyr Zhdanov <wight554@gmail.com>