| commit | 0178ecfa43c6e8a29ca5f2562f3c3af773cb963a | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Sep 19 16:02:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:02:04 2014 +0000 |
| tree | 64449d9d9415b0dc9e035ecc4b3bd8e1217be3df | |
| parent | ce179a2c5a271c98b39b0e1b9481eac498ece7ba [diff] | |
| parent | 8d9f12161823f267179f46825734c188b6c75b09 [diff] |
am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev * commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc': Allow primary user profile owner to set device restrictions