| commit | 0186b42f2ae7e2c7b3e88043c2d1cb255f09514e | [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 | 500b6e1233f875e8f93f98759f3130234d637832 | |
| parent | 69196f6fadf2445c2b9c06c17162d0cd3dfaeb5a [diff] | |
| parent | 9272dab49efa9c70ab92879c3e79a76fc8364d34 [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" key API