| commit | de5eee4f9e46881a0a7b389df1e64af5d20b0ca8 | [log] [tgz] |
|---|---|---|
| author | Brian Young <bcyoung@google.com> | Fri Mar 30 14:21:19 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 30 14:21:19 2018 +0000 |
| tree | 3222dcd2fb0253f75433aa2bb68f77cdf8d822b2 | |
| parent | c4b0565e83a7841d23b18944ade6faffbe9f28b7 [diff] | |
| parent | 9a947d573bb1843bc742d5be1e518a640335363b [diff] |
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