Merging ub-launcher3-qt-dev, build 5530094
am: c07fad7123

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