Les Lee 2edd0e9db6 resolve merge conflicts of 155f20a6cd to android12-tests-dev am: 559df942c8 am: a7ce9003ed am: 45263c60fa ...

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2141153

Change-Id: I96b950e95d8e7295f6f8d65a8116eba8537d45f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-07-01 05:20:53 +00:00

..

1.0

Merge "wifi: Add sleep 3 seconds to allow terminate processing in VTS tear down" into android11-tests-dev am: 7618b4cc8b

2021-10-29 22:23:35 +00:00

1.1

Merge "wifi: Add sleep 3 seconds to allow terminate processing in VTS tear down" into android11-tests-dev am: 7618b4cc8b

2021-10-29 22:23:35 +00:00

1.2

resolve merge conflicts of 155f20a6cd to android12-tests-dev am: 559df942c8 am: a7ce9003ed

2022-07-01 05:05:07 +00:00

1.3

Add timed out test files to tidy_timeout_srcs

2022-02-18 17:25:41 -08:00

aidl

Merge "Enable the tracing for Wifi supplicant and hostapd HAL." am: 235abdf23c

2022-06-30 17:49:15 +00:00