tree b0bdbaa858baada108ea3de4a332b889c074dd7e
parent 6358eb5f474917f8707d545ea546812c9b7795aa
parent 9e83ba5a5bdf96b0b0872001df8f1f15348e06c0
author Sunny Goyal <sunnygoyal@google.com> 1498177866 +0000
committer android-build-merger <android-build-merger@google.com> 1498177866 +0000

Merge "Adding support in IconProvider for loading different icons for UI and model use" into ub-launcher3-dorval-polish
am: 9e83ba5a5b

Change-Id: I93add5f3b7bda2139640165f9b749cb5388084e5