Brad Ebinger 500e9fe015 Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622 ...

am: a77af22570

Change-Id: Iae64fa9a18fecd98e97030abdfd08eabd7b29ac8

2018-03-16 21:10:51 +00:00

..

android

Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622

2018-03-16 21:10:51 +00:00

com/android

Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev

2018-03-15 04:55:20 +00:00