| commit | 62dc11eca588add7098d4491dfa28b321bc767b8 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:08 2020 +0000 |
| tree | 38a160cf38b345bb4e35e61545f5c5b8cb077194 | |
| parent | 7e3fd726be63f9f2b9a136cccf6217e9914bab96 [diff] | |
| parent | 4d84bd66b6c426ce4fdf10ca5f20fde71007450d [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3ad2a7db92 am: 3e62bb93d6 -s ours am: 4b5a31c80d -s ours am: 4d84bd66b6 -s ours am skip reason: Change-Id I996b311e9b86fe3375ebb84cb1bf8798e22a4b18 with SHA-1 0b13e619a7 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1431551 Change-Id: I7901914dbcc5468d505cbccc1a0cc9116fc94260