Merging ub-launcher3-qt-dev, build 5596239 am: e0d5fec5f2
am: b67b3c5824

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