tree 02fced8b9ac5ef917322e51914a07b37517fab84
parent b497945f12f6b3af9a0020cf87aa6cadef390bf7
parent 8144aa2e9a732be6ba66c385a590e07ec59c5f77
author Adam Lesinski <adamlesinski@google.com> 1435095787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435095787 +0000

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

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