Merging ub-launcher3-qt-r1-dev, build 5662440
am: 7c4d224817

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