tree 7f906d0692d808012bfc6c848a315debd833d142
parent e4d5abcfb765fd890cc3221681f726442b59a311
parent 6beaff255f129a55348f8d8aa6f42d42d4b679bd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579912163 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579912163 +0000

[automerger skipped] Merge "Redesign the setPreferredNetworkType" am: 2e002bac82 am: 21cc1d2f19 am: 6beaff255f -s ours
am skip reason: Change-Id I5902509d79608c7aae697fbb247c7904f8d098a1 with SHA-1 846d9646c0 is in history

Change-Id: If5a3fdd4de4fa9b6c3ea78974e4926dfe79680c0