Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 8a743ef1c1 -s ours

am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 3c346f2cdf is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402

Change-Id: I5b7d14ce0ffeffb734c894e41b74bcbb47238068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: fdfbce599aa9a1a8bb98fa12ac2c344d6197ff0f
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk
  4. METADATA
  5. OWNERS