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

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