From: Eric Biggers <ebiggers@google.com>
Date: Wed, 21 Oct 2020 00:02:21 +0000 (+0000)
Subject: Merge "vold: Generate storage key without rollback resistance" am: 4f5e9c196f am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6417fb00bd6b0adc688c7c9295a46b1c2fcb771b;p=android-x86%2Fsystem-vold.git

Merge "vold: Generate storage key without rollback resistance" am: 4f5e9c196f am: b6d1a31949

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1426109

Change-Id: Iaab2239444df05a089224bd145fe6d9c4baee436
---

6417fb00bd6b0adc688c7c9295a46b1c2fcb771b