tree e18c6723c817be67e8173915232b9f6622d4bc02
parent fcc309926df1ed6598c958041a0058893592a47d
parent 1635ca950fb4b34ae1ca020ac2cec181332ca184
author Mike Yu <yumike@google.com> 1646806878 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646806878 +0000

Merge "Make boot_time::timeout() timeout immediately when passing zero duration" am: 8bc0e5c6a4 am: 1635ca950f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2015217

Change-Id: If22b7a2e0da96efd85fd6af745d477b68144eeac