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

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