tree fee42d81776b0bc1dabdfd8541bed5aeefa41180
parent 6d5522dc76d6feaeb53fd909a9df5e2049a33d1d
parent f5edfa9b775abe3789472f5551c9c1baefbcc1a2
author Trevor Johns <trevorjohns@google.com> 1374708058 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374708058 -0700

am f5edfa9b: Merge "Add AppRestrictions sample to new repository" into jb-mr2-dev

* commit 'f5edfa9b775abe3789472f5551c9c1baefbcc1a2':
  Add AppRestrictions sample to new repository