Merging ub-launcher3-qt-qpr1-dev, build 5816382
am: 591ff9b8e7

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