tree dcec10bcd6f6a5a947a1d3d6e376b4dd10560f09
parent dee16d5915b9b6c3022fbb8d98674596948c9d0d
parent 7518fa2d4045ad392bb5586bc0a60467e37b6e53
author Jon Miranda <jonmiranda@google.com> 1497982576 +0000
committer android-build-merger <android-build-merger@google.com> 1497982576 +0000

Merge "Show and update preload icons when they are in a FolderIcon preview." into ub-launcher3-dorval-polish
am: 7518fa2d40

Change-Id: I025e7fd2cfa833fbb0875cdf64819438c62eb93f