tree c1eb018e6c4737b9acc267e371a844fddb5ddac3
parent a73a8fe2cf5b5e9a7725f083dab0010504fb2afd
parent b2f5d3e98ce4286498cf241078f39eb1ab02afd5
author Bo Hu <bohu@google.com> 1630003831 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630003831 +0000

Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I0cb86918fd5b5eb31ed633cc7dddcea12c125bd4