| commit | 40a7020f66f8b81f8364b11b6e59063c14ce623c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 17 09:19:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:19:15 2020 +0000 |
| tree | 38a160cf38b345bb4e35e61545f5c5b8cb077194 | |
| parent | d258a1770d82d20e3d954618eab68d4b338265f0 [diff] | |
| parent | 954e0eddc67f346bed5003d268a42585a59c9995 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R" am: 7c0c35442f am: 55bd980ca1 -s ours am: 954e0eddc6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1363361 Change-Id: Iddb25127b8d55b80dc6b22069c465a477e801dd4