tree 64067ff4a84120d0a3034dbb42f2ed1930502546
parent 2d268f3508e45ab87f8ced0194595c42daf6e7d5
parent 2cb384f42569f36e19ecee60da259d69048fdd85
author Julia Reynolds <juliacr@google.com> 1408565310 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408161822 +0000

Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev