[automerger skipped] DO NOT MERGE: Fix various settings chassification bugs am: 2d23f495ff -s ours
am skip reason: subject contains skip directive

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