Merge "Remove CDMA doc in setPreferredNetworkType()" am: 8aeeea135a

am: 89470414f2

Change-Id: I085a2a02eecf2b28ccb63d393f9e909713bd4e65
This commit is contained in:
Nathan Harold
2018-11-16 12:52:43 -08:00
committed by android-build-merger

View File

@@ -6130,7 +6130,6 @@ public class TelephonyManager {
/**
* Set the preferred network type.
* Used for device configuration by some CDMA operators.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling