tree bc3f82a44ad640213f07974f683c58488695477f
parent c362ec4bf57aa460db78b747c9e36231fc8a0d0a
parent 15fc854d77093a29e354a98a3eeb3a0456718484
author Amit Mahajan <amitmahajan@google.com> 1436825163 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436825233 +0000

Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev