[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2e1c331fc3 -s ours am: 2ddae418ab am: fb304315d2 am: 63f901c829 -s ours

am skip reason: subject contains skip directive

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