Merging ub-launcher3-qt-r1-dev, build 5759495
am: 77db8d0669

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