[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8d1c1e6b93 -s ours
am: 20d7b4e675 -s ours
am skip reason: change_id Id15a0e7908a1feee86bab8cedd06024518107dd5 with SHA1 889541b8d9 is in history

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