[automerger skipped] Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf am: 1c2114de42 -s ours

Browse Source

am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

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

Change-Id: If5295b3fda7b0f3968cca0628f1233817af91ced

...

This commit is contained in:

Android Build Prod User

2021-08-26 00:26:31 +00:00

committed by Automerger Merge Worker

parent 2c536b6eee 1c2114de42

commit b360ac1b4c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available