tree 6f751affb1da403f0cb5d4e770387fe8aca4c547
parent ffaebb0ea5b8605ebb641d3ee75c3311d9a8800b
parent 6df4c12b475aca7087f79c3fa5c3d56a2b18f8b7
author Amith Yamasani <yamasani@google.com> 1366950197 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366950197 -0700

am 6df4c12b: am d59b0643: Use user restrictions instead of isLinkedUser

* commit '6df4c12b475aca7087f79c3fa5c3d56a2b18f8b7':
  Use user restrictions instead of isLinkedUser