tree 9ed0c4c07b9952f9c8b0cf8e2843f3f44c1632b0
parent 4279308ad71f01e3cb9275de9d404af9909dadcb
parent f462515bea80fd6c66fb374616bb519caa66ac2c
author Treehugger Robot <treehugger-gerrit@google.com> 1608159683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608159683 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c8a0ba69c125e6812cff732de406482db32bf6d