Merging ub-launcher3-qt-dev, build 5456233
am: 0866c063d9

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