[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6f6e0cbbd1 -s ours
am: 1255324375 -s ours
am skip reason: change_id I984acb3bb82c4280d3389f0efbfad18b424e293f with SHA1 5941341ddb is in history

Change-Id: Ib6ed880754dfa75fb0b285097c7e0025f89bc46e
tree: 6068b4b9fbce32d98a52cd6ec284a418b310dc68
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. OWNERS