Merge "DO NOT MERGE: Fix various settings chassification bugs" into qt-dev am: da8860aae6

Change-Id: I14549a415f46892ad3cd2b29d4c2f3e78ccedc23
tree: 8768cffc3859a6a54a7afa417ee3163c4275cc7a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg