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

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