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

am: 9075818aac

Change-Id: I7c483985257ee647c7d741e3e0c17efe390bd267
This commit is contained in:
Nathan Harold
2018-11-16 13:59:42 -08:00
committed by android-build-merger

View File

@@ -6349,7 +6349,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