tree b9af14701d2b5239395cd345f1f58314a716ac4e
parent 12f7e5a72b3a2bb4c87f3ce6b5a5b26a044315d5
parent 01cd87c421a5c2859194957f6c6b87f268403762
author Treehugger Robot <treehugger-gerrit@google.com> 1608181921 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608181921 +0000

Merge "Keystore 2.0 SPI: Implement modification time." am: d2e7c2e000 am: f462515bea am: 01cd87c421

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7eeb2f1733c724a241f6ce0a5a52a60444def83