[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: f23cfe1347 -s ours am: e56ef6df6d am: 7f5751bc27

Change-Id: Ifdb421f3338c728782e7c49bf32b20428d7d8e29
tree: 4b27fb9005abb5936bff9d0582c1babf1ba56009
  1. oem_template/
  2. src/
  3. testing/
  4. Android.bp
  5. Android.mk
  6. OWNERS
  7. proguard.cfg
  8. README