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

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