tree a9e921474c75f309f5ead2caac1f8bed9abf540b
parent 59bd2ae1af5d1236dae14f0539d48acfa08d5e80
parent 57a992021b2279f34265eb403816417a1ce682f2
author Amit Mahajan <amitmahajan@google.com> 1438302029 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438302029 +0000

am 57a99202: am d247d8b4: am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev

* commit '57a992021b2279f34265eb403816417a1ce682f2':
  Add OrSelf to privileged permission check.