tree a50ef97f0d19e8525bde70d2bb3d44a4aa4fdeb6
parent 637ddfc1a250df70a9ae5f8275358c7e2ef34194
parent 7c4c31eca169ed9d4a839e71dbf35125ec5beadf
author Hyunyoung Song <hyunyoungs@google.com> 1529100032 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1529100032 +0000

Merge changes from topic "clockicon" into ub-launcher3-master

* changes:
  [automerger] Create a param to return scale used for bitmap creation Bug: 110082040 am: 4bc3cc3111
  Create a param to return scale used for bitmap creation Bug: 110082040