Merging ub-launcher3-qt-r1-dev, build 5724722
am: 4ebd3d4b7b

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