Merge "Changing the scale factor for square icons" into ub-launcher3-calgary
am: e7217a5

* commit 'e7217a5329fab3a8974d9bd9b8f096ad01ffef46':
  Changing the scale factor for square icons

Change-Id: If73405ec99923dddd6877c11ccd068874ff5dc9c