Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into...
Amit Mahajan [Mon, 13 Jul 2015 22:06:03 +0000 (22:06 +0000)]

Trivial merge