[automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 am: 5bddee5dda am: 7e3ab7815a -s ours

Browse Source

am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61e7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4296856168c4a7261fd12a172e0336010688499e

...

This commit is contained in:

Rubin Xu

2021-02-18 00:30:09 +00:00

committed by Automerger Merge Worker

parent 2cc5ce22b5 7e3ab7815a

commit a06569676e

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