Merge "Update trusted device alert message." into qt-dev
tree: 9b570a620d0f09525f94993460a13792d5c2f9e3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg