OSDN Git Service

Merge "Refactor key generation to handle both normal and metadata encryption." am...
authorPaul Crowley <paulcrowley@google.com>
Sat, 15 Feb 2020 02:13:22 +0000 (02:13 +0000)
committerPaul Crowley <paulcrowley@google.com>
Sat, 15 Feb 2020 02:13:22 +0000 (02:13 +0000)
commitbdd9fbf9dbda429393ee0d86a74c71fdfbaa6a19
treef3973a179d7cf718a2fe1f7434b421a9dfdf50e6
parent41bac014cf40cad661ce1b5368774b3f30bc8e68
parent79b853551df781b2b86875554bc1077c5abd30f7
Merge "Refactor key generation to handle both normal and metadata encryption." am: 8e0780cba2 am: 79b853551d

Change-Id: I644d55df9c5a5441ead5b6790efff159b292c957