[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 639116d20f -s ours
am: 74c2c255b4 -s ours
am skip reason: change_id I0f9ac646b953d8831f47f28b2f20df90d9b028d9 with SHA1 209f1362de is in history

Change-Id: I7867200273d3e18f37ee7c2ea8b8e83c5a3a24b6
tree: e274c55358f1639a00ed65526b2a117f367af6bf
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. robolectric_tests/
  5. src/
  6. src_override/