tree 3222dcd2fb0253f75433aa2bb68f77cdf8d822b2
parent c4b0565e83a7841d23b18944ade6faffbe9f28b7
parent 9a947d573bb1843bc742d5be1e518a640335363b
author Brian Young <bcyoung@google.com> 1522419679 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522419679 +0000

Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev

* changes:
  Restore "Add "Unlocked device required" parameter to keys"
  Add "unlocked device required" keystore API