Merge "Update icon names" into ub-launcher3-master
tree: fac5fc63cebc0e57d7b9d6edb3d135c065108b92
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml