[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b003eb8193 -s ours
am: cf76917e7c -s ours
am skip reason: change_id I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee with SHA1 048a25a0e6 is in history

Change-Id: Idb9bc87ff098aa12daec3f5f075bc98d6a4bc99b
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proguard.flags
  5. res/
  6. src/