tree 1b752a6cd570c38e728b59b548022d378f671260
parent 40e1e3bdf6f5e070fdca8ae6e5ee91bf577622eb
parent ea40c7e4fe23c2b34ecf1439ab0a96a8dbf58c7b
author Daniel Cashman <dcashman@google.com> 1442418171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442418171 +0000

am ea40c7e4: am 5b8d6bab: am ed1f8205: am 076d7ecf: Merge "Add DUMP permission check to ResourceManagerService." into mnc-dev

* commit 'ea40c7e4fe23c2b34ecf1439ab0a96a8dbf58c7b':
  Add DUMP permission check to ResourceManagerService.