[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: e0469d4468 -s ours am: f417fcb2b5 -s ours
am: 686b8d862b -s ours
am skip reason: change_id I70264d2ce9d20694b86aaff57b0176f18b43c634 with SHA1 1d8b9ccdc5 is in history

Change-Id: I0b6518efd31e2181d81f328e3f50c11dc2dbaf54
tree: 1e54620dd15c819d5e94879836a7075a15c7d79c
  1. srcs/
  2. OWNERS