Merging ub-launcher3-qt-dev, build 5497005
am: 6828156fbf

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