tree 7ff890c41d7afe1b20c45fcff1a4b9c7b385ff90
parent 2cc5ce22b5b830ffe1e8a248aab71fe7e0ac1dc6
parent 7e3ab7815ac19b0dbf586bc274b362b7e0878a6e
author Rubin Xu <rubinxu@google.com> 1613608209 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613608209 +0000

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

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