[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: dd19a28d6c am: d3124c5c78 -s ours
am skip reason: subject contains skip directive

Change-Id: I009d2a6e8cd97a260e3003c4f1f41a8fec76266c
tree: 0471bca9812f371d4b882db6ca3c0fc638689fcb
  1. src/
  2. Android.bp
  3. CleanSpec.mk