| commit | daeda0525b73c1b5b4275034b5e160bd46b8186a | [log] [tgz] |
|---|---|---|
| author | Joe Bolinger <jbolinger@google.com> | Mon Jun 21 17:06:29 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 21 17:06:29 2021 +0000 |
| tree | 0aba6bc3bbd828d40cc6c4812bca78696db8b6d4 | |
| parent | 34961821f4228dae766c16c62ebbeb5444bda758 [diff] | |
| parent | 2976b9bc14e3f9deba9cb617ffd74150f7396f65 [diff] |
Merge changes from topic "unicorn-hand" into sc-dev * changes: Add new enum for parental consent UI. Add handoff activity to parental consent flow.