[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 936824ada5
am: 246dfed98b -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd1eaefcb135cc7a785df00da5c2d13fd4d52877
tree: effc13d50db0c020d2659313accb2a5693d25115
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg