| commit | 5d9c49fbe2b592d2f275cf57d1e16c1ddf5b16d7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 13 03:22:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 03:22:23 2021 +0000 |
| tree | 0416b898c9e4d80dab7d76513e1601cd734560d4 | |
| parent | bfd7694639ddf66c0e2358cd677aa58f872300d8 [diff] | |
| parent | 5ac4488fecbccb9779b51798d4f3c9c0c7e06fb3 [diff] |
Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9 am: 5ac4488fec Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447 Change-Id: I616459f0a631b84dac9cca508326dbd47ca1522e