[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c26793c451 -s ours am: a0ab48b335 -s ours
am: 357becbad9 -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cca5 is in history

Change-Id: I61a17e95799454c5539bf1de32e85fc6c879e4a5
tree: 09a382c89d58ac170687b86f24f3ebc3f80698b6
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS