[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e370a75148
am: 10ea32d470 -s ours
am skip reason: subject contains skip directive

Change-Id: I13be2168c9a81288713e1d010d54de24d0aac3e8
tree: 33c2e88f3ff23a1620fc15a2011c11c781fd7148
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS