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

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