Skip to content
Commit 5d9c49fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore."... 

Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5 am: ad73e362 am: 41d04381 am: 5ac4488f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I616459f0a631b84dac9cca508326dbd47ca1522e
parents bfd76946 5ac4488f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment