| commit | 2694b808b223749160a22a1ea09deefe767266c5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 18 16:14:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 18 16:14:07 2020 +0000 |
| tree | 345d47e99eb29eb35c5e4656e10ffe72051f3639 | |
| parent | cf67a70f6883c4951fd071585dd5bbdb99129d61 [diff] | |
| parent | ab1b8a7a20a3909eeb507f6a50a9e2261c1377a4 [diff] |
Merge changes from topic "ks2_with_keymint" am: ab1b8a7a20 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475676 Change-Id: I08d3dde8893025c9d7317ac15341d846d1b8944d