[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1fb21efdbf -s ours am: 2c2b81b270 -s ours
am: dc12453a8f -s ours
am skip reason: change_id I741e3c87515809659392cdc404e5183e4617d82a with SHA1 6854a6f6d4 is in history

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