[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 2455137d6e -s ours
am: 335f0efc1a -s ours
am skip reason: change_id I3ec7243ec10f71f4bb7a4464c4563cb6d5be4ad1 with SHA1 6622e9ed59 is in history

Change-Id: Iccaf74e2e41200a02aba84e54f229b102db6e6bc
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. Android.bp
  2. AndroidManifest.xml
  3. art/
  4. res/
  5. src/