tree 43dfb930448fc6e80b6e08646a53f33762b5e86c
parent 569a271f0c32a66b33f305e5181c7687b6303aa5
parent 370c27c7fe308e351d375295d422df76f7ede164
author Amith Yamasani <yamasani@google.com> 1436402828 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436402828 +0000

am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit '370c27c7fe308e351d375295d422df76f7ede164':
  Qualify the uid with the userId when granting permissions