Merging ub-launcher3-qt-r1-dev, build 5706291
am: 70528c08dc

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