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

Change-Id: I406bf89a1f0e1677b2b1d49b02d4956647ca02fd
tree: db22aa44e192ae2ba85ba897457a0a751d718f19
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. OWNERS
  6. proguard.cfg
  7. README