tree 6c53e39284e3cc207660957cf4317befe939eb74
parent e1367ec912ce5429ffbe67daadd409f0eedd54d8
parent c0ea72cf104d1c0e5f36d5726aafa004c6c9daaf
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1574789493 -0800
committer android-build-merger <android-build-merger@google.com> 1574789493 -0800

Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87
am: c0ea72cf10

Change-Id: I916e810b6350be9c1a6b24f2a652e05a1fa444fa