[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: de4db36baf am: 2ca44b41ac -s ours
am skip reason: subject contains skip directive

Change-Id: Id6ee0c6adc847b866bb13a9f0098d99cba56a2b0
tree: 78e59a3d1e92cdfd7487c5fc27dbed059d3c2dc1
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk
  7. OWNERS