Merge "Adapt the API changes in SettingsLib" into qt-dev
tree: ac29cc3e7e985fcc506b12ade4f34a13ddaf3a2a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg