| commit | 804d0286e59c8f68a9e44172cb5e29128f5a1ec0 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Oct 06 21:20:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 06 21:20:21 2021 +0000 |
| tree | 68b2cc5ffee7ed2c29451db112033a046c5034d9 | |
| parent | f9d8fc9217b205ee8b60bdabb70b4c7e916af082 [diff] | |
| parent | 0860368335d7356783d031163a6b3b0414554875 [diff] |
[automerger skipped] DO NOT MERGE KeyChain protect against overlays. am: 42d5b5ec58 -s ours am: 6f2b9a89ed -s ours am: 310b9c977a -s ours am: 2993b6c62a -s ours am: d7fd288d91 -s ours am: e7d806b3c5 -s ours am: 0860368335 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/15926114 Change-Id: I448b72671d441a4b949beda996230fdb9a7a5ea8