Merge "Fix resource issues causing test failures." into qt-dev
tree: f4e760ea91ac4b517400d22862d043e49a6ad49d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg