[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 3ef18c7fc6 -s ours
am: 3f4c514472

Change-Id: Ia5b73a340c8fa3923247b53aef9f7400b320dcfb
tree: 56adc7fae8abc205282479ea2b0848ce2b559a01
  1. com/
  2. LICENSE
  3. README.google
  4. README.txt
  5. update_repo.sh