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

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