Merging ub-launcher3-qt-r1-dev, build 5781802
am: 45d5cd2c30

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