commit | a08b23e2f5b35dcfee5d9fadb1e3d17e0335e882 | [log] [tgz] |
---|---|---|
author | Jessica Hummel <jhummel@google.com> | Mon Feb 03 18:12:58 2014 +0000 |
committer | Jessica Hummel <jhummel@google.com> | Tue Feb 18 11:31:02 2014 +0000 |
tree | 462902f408b38297c4ea092fea3e5349c3641834 | |
parent | b4e71304fac2eac273a5cf66af7240bc52f30a1a [diff] |
Merge ManagedProvisioningActivity and ConfigureUserActivity. They were originally split because the ConfigureUserActivity was started as a different user. We now do the full setup from the primary user and only access the secondary user/managed profile. Change-Id: Icdaf95c572bc5942332cfb5fff6236d672cf2a51