tree 17fbb169d3fcc8565990ad349df2c98e8c7f9d9f
parent c9076a7e8dc0bda09070d64326bb98ce90886b95
parent 53ae130d31a485682d8babdf0dbf9ab261732d66
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580946092 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580946092 +0000

Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31

Change-Id: I3f24b00947dbdba84c0b1a1f1c6828ea0f7a22f9