Youming Ye 409b7fd693 Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 am: 22b595e5bd ...

am: d07819d5cc

Change-Id: Ie07d14e12ef078f2dd87af697229b6c052a3d712

2018-10-30 19:02:26 -07:00

..

android

Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 am: 22b595e5bd

2018-10-30 19:02:26 -07:00

com/android

Merge "Revert "Allow apps with carrier privileges to access device IDs""

2018-10-30 23:52:59 +00:00