Merging from ub-launcher3-qt-qpr1-dev @ build 5834630
am: 9ac4009346

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