tree 0f9b606dd48ec41d3b41995b87cd0e1692377e7e
parent 97837d595ff6223a655957f2ce1003e9da6dc9a5
parent 978c8728f55bd4d5b8ed298eda30d30658ebdd19
author Robert Greenwalt <rgreenwalt@google.com> 1622443763 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622443763 +0000

am 32c9cd84: am 939def7d: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev am: 978c8728f5

Original change: undetermined

Change-Id: I2240e26ff2f8f7388952390d969e18e5a3863848