Merge "Change the default assistant picker to use the permission controller" into qt-dev
tree: 8a2c9b33fe90c6c5d76df36236a95d84248b74f4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg