Merge "Update trusted device alert message." into qt-dev
am: 2a11353a4c

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