| commit | 41d04381e9abc0fac36f7172ca94a627a2f6f3cb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 13 02:45:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 02:45:15 2021 +0000 |
| tree | 41d39b86d8b4cd55a224934707dd25a461743c44 | |
| parent | 233682e67511e30029e68d7de24dac448a810c19 [diff] | |
| parent | ad73e362f074eae74b330e2f82a80fb292dbc7f9 [diff] |
Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447 Change-Id: I13644c975e38ef52635c9e55cc4ccca2b96902fd