tree 0ed71cbcb42ae6af13e9334b2d209d38a2872017
parent b7ebbded5f1512c5747acc0f06a42399d7710728
parent 3d9eb78fe91ab2479eb38443aed588e10421e31b
author Julia Reynolds <juliacr@google.com> 1408134238 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408129400 +0000

Merge "Apply lockdowns when user restrictions are set." into lmp-dev