diff options
| author | 2021-05-13 03:00:40 +0000 | |
|---|---|---|
| committer | 2021-05-13 03:00:40 +0000 | |
| commit | 5ac4488fecbccb9779b51798d4f3c9c0c7e06fb3 (patch) | |
| tree | 39d2bfc54edcef7f7d94c426641a0ae7c7f3037f /libs/androidfw/StringPool.cpp | |
| parent | 92bc335785deffb9c9b62dea4c25639c4465c1fa (diff) | |
| parent | 41d04381e9abc0fac36f7172ca94a627a2f6f3cb (diff) | |
Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447
Change-Id: I3247db1b8db8691705a3a7856d696a84f0fd1413
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions