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

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