[automerger skipped] DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master am: e0e43bbd93 -s ours am: 5a8dfa62b2 -s ours
am skip reason: subject contains skip directive

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