Merge "Reorganize intents to have the same order" into qt-dev
tree: 23fdab84c007828baccd97bc9cbe1f31ce8e5d38
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg