| commit | 8d9f12161823f267179f46825734c188b6c75b09 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Sep 19 15:51:38 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 19 15:51:39 2014 +0000 |
| tree | 1b42652fea8f3fa7b8d1436bd9b752778f26e945 | |
| parent | 585391803ed7ec2a07618668ded1812aa9eb507a [diff] | |
| parent | c34dc7cdeb5cae8ca4c731838aafe90ed4c9a2b8 [diff] |
Merge "Allow primary user profile owner to set device restrictions" into lmp-dev