tree e4ccb40066ee62d659f780718c8921d93da57062
parent ee6046add136d4791e71fb17a07076b425b7250c
parent 53c750142332cb33e604266b7c6d09191c32691c
author Amit Mahajan <amitmahajan@google.com> 1438300714 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438300714 +0000

am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev

* commit '53c750142332cb33e604266b7c6d09191c32691c':
  Add OrSelf to privileged permission check.