tree 232e54d4503fc624ab22e9acb10f5a1c21bd3116
parent 814a683d0ef8d5f7e93d462dade2c0d2087e6126
parent 3ddb64efb5df3e1c6fda4bcd8d03c7f36217da9b
author Winson <winsonc@google.com> 1467157221 +0000
committer android-build-merger <android-build-merger@google.com> 1467157221 +0000

Merge \"Bumping icon version to clear db to trigger loading from IconProvider.\" into ub-launcher3-calgary
am: 3ddb64efb5

Change-Id: I348c23d87d2d6d58734009b9c1b6555c24f84e37