[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: fa91357ae2 -s ours
am skip reason: subject contains skip directive

Change-Id: I1ed0b86b9f0909985dfb7f152823ebb6be8f70b9
tree: 91a89fc8120d8b567fe1d6ff39fc97c35c3cf411
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml