tree 64eb3f1995b7f105c8a427e4897c3af940e9bf26
parent b22aabbbd2801db0be526a64badf2efa208f19f1
parent be46532c9fbebf3ab6498c1b78013a33f620cd31
author Amith Yamasani <yamasani@google.com> 1398450216 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398450217 +0000

Merge "Allow profile owners to set user restrictions"