tree c6a3ad691f9009d56b3b329493110c683422932f
parent c31b03dba7bb2b84932002fa3e118cd3fd84a5fc
parent 05feded4f153707eadefe04f727be962b3e87778
author Adam Lesinski <adamlesinski@google.com> 1435096538 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435096538 +0000

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

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