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

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