Merging ub-launcher3-qt-dev, build 5570425
am: baededcb61

Change-Id: I8b6e053fc7be48ff1d8c310dc75e529527ecd358
tree: 7f7b415346a6b27bc91b6f36c688d2bcc038f9af
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml