Merging ub-launcher3-qt-dev, build 5484164
am: e179ae0ab5

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