tree 73287e15c5f966b0f4a5cc580edeec1890e4961f
parent c018cb6bc14c645ac743ed80446ff73dcc9d5a36
parent 6fa699902fece338d7d744672c62a90fc594f6ef
author Hyunyoung Song <hyunyoungs@google.com> 1498067265 +0000
committer android-build-merger <android-build-merger@google.com> 1498067265 +0000

Merge "Adaptive icon fetched from icon provider and/or work profile icon should not change during DnD Bug: 62806605 Bug: 62823315" into ub-launcher3-dorval-polish
am: 6fa699902f

Change-Id: Id8be07a27798fb1c6308a7607658f5939fbca27e