Merging ub-launcher3-qt-r1-dev, build 5691421
am: 427aa9b82c

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