OSDN Git Service

Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi...
authorSelim Cinek <cinek@google.com>
Fri, 8 Jun 2018 23:21:44 +0000 (16:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 23:21:44 +0000 (16:21 -0700)
commitfdbc313a65689fe152e477037b51ddab9b627e00
tree70f87101485c6a2a981f89c0ed409a782021f2c6
parent3bf4596bade651ea3bb8cee5b96ec5ceb420d952
parent1a37d5fcb9bbc587c8bcd091858c1728b8b616ea
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev am: 70a9cd292b
am: 1a37d5fcb9

Change-Id: I15e25c686c21f8bcadd3adc714c7ea5c2b400e12