[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 38a277ff62 -s ours am: e49f658985 am: 0cf7cecc1e am: b04f618bc6 -s ours

am skip reason: subject contains skip directive

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