commit | f051c127c63d1713822f0e18a4bc2e8508fe66d9 | [log] [tgz] |
---|---|---|
author | Brian Young <bcyoung@google.com> | Fri Mar 30 14:21:20 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 30 14:21:20 2018 +0000 |
tree | 4de4819cbc284f3728a8f2324e29382dbf18360f | |
parent | 786e3ee924367a19a8b6273f30a84ccd9e2a096e [diff] | |
parent | 8882914254803f97ca166863544cc917eb319ec9 [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" API