[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours
am: d1f953fad8 -s ours
am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history

Change-Id: I45ce7f338e7b43ab807b8dc94084d91afe56c41a
tree: 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
  1. library/
  2. tools/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg