| commit | d258a1770d82d20e3d954618eab68d4b338265f0 | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Fri Jul 17 09:19:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:19:14 2020 +0000 |
| tree | 38a160cf38b345bb4e35e61545f5c5b8cb077194 | |
| parent | 338c219fa6c1ec4a0b64cc8b327df8223b0df5fe [diff] | |
| parent | d46828c69c0c8590c00bd451a75a80d65512ff7b [diff] |
[automerger skipped] [DO NOT MERGE] Rollup changes from R am: f541a87ab6 am: a36e795a77 -s ours am: d46828c69c Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1363361 Change-Id: I5b4b34b0fa2fa9e813888df49db494f11053ac3f