Merge "[automerger skipped] Merge "Update the java doc of AndroidKeyStoreProvider#getKeyStoreOperationHandle to support Signature object" into sc-dev am: b4e9cab136 am: ee1eedbcc5 -s ours" into sc-v2-dev-plus-aosp am: 20e92b79c0 -s ours

Browse Source

am skip reason: Merged-In Ie65dcfe96f3bb00cc9af4d49e4e1d1f57bde438a with SHA-1 49a5bb208c is already in history

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

Change-Id: I7c3e80cf88448fa09bc781b8a9270b67b79332ce

...

This commit is contained in:

Automerger Merge Worker

2021-06-23 15:05:49 +00:00

parent 136b3826f8 20e92b79c0

commit 3bf66db508

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available