| commit | 7e3fd726be63f9f2b9a136cccf6217e9914bab96 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 22:20:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 22:20:20 2020 +0000 |
| tree | 38a160cf38b345bb4e35e61545f5c5b8cb077194 | |
| parent | 4b9e0b168bec1dbf03337df4079a6f95863816b8 [diff] | |
| parent | 950589b53a7b762215ec40d48bc4fa0c8b134a8c [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: bddc0756cd -s ours am: 0b13e619a7 -s ours am: 950589b53a -s ours am skip reason: Change-Id I012067f9e4ecaa2921d5c7608f2f55b5cc5fb683 with SHA-1 32a4cc7282 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/12579486 Change-Id: Ie3bac24aa0e33d5bbc20fc9120cce5f450a57d85