tree c1a33d3ce56cde4aa57480ce54ba7508584601cd
parent 5c9eac58849c152ef487c11996b6137b6e2b9bd6
parent 0e0862f3d9524f3871be73125ce48845aa46d558
author Amith Yamasani <yamasani@google.com> 1411144850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411144850 +0000

am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev

* commit '4ad6b3ef184424e36915bc046e04706f2dded0e2':
  Allow primary user profile owner to set device restrictions