[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 36ccae5f90 -s ours
am skip reason: change_id Icc751a05abba7c0dff8c9f8cabb5ca5d0c0baeef with SHA1 fa91357ae2 is in history

Change-Id: If13d7167acf14bac114084e5037743d90dbdb777
tree: b4407ed312afb164b4febf140865990ee25ae37b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml