tree b11831e340081d187257d66a99bcb2a0f7fea162
parent e67268e66d5507832fa0c53dc7e08a72662610bc
parent 7c17ec5fa5cb51d12713016622e4b5a939c8bb76
author Nicholas Sauer <nicksauer@google.com> 1440613526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440613526 +0000

am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev

* commit '7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
  Add GET_APP_OPS_STATS to Shell