tree 3ab3059b9de3a279a610627f2bd05ede4ca4df51
parent 7f70dab11c9eeccfc5a21f36dd7d0f9fa89d1340
parent c62dafdffc5a382b47d47d5aad528d8500eafb3b
author Adam Lesinski <adamlesinski@google.com> 1435101022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435101022 +0000

am c62dafdf: am 05feded4: am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev

* commit 'c62dafdffc5a382b47d47d5aad528d8500eafb3b':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS