tree a7a06787c4eb79dad3e09366f474238bf923be12
parent e46df861e811edd3573af6889b6e3356e1dc8c22
parent 8c6a2b224466a355dbeb2b863a3b193deb471301
author Hyunyoung Song <hyunyoungs@google.com> 1492472576 +0000
committer android-build-merger <android-build-merger@google.com> 1492472576 +0000

Merge "[DO NOT MERGE] legacy icon treatment / circle detection Bug: 37357483" into ub-launcher3-dorval
am: 8c6a2b2244  -s ours

Change-Id: I9e1ff10dcfb2d0adca42566e822968ea5894a9f7