tree 906a9496e49fcd70ed7a39bb8431b8f1b9bc2fa2
parent 2668ab58d5871a48245a816f19c1bad4e7457670
parent 59fbea393b91b6156e42d2487cde6c3827fb7574
author Tony Wickham <twickham@google.com> 1498671641 +0000
committer android-build-merger <android-build-merger@google.com> 1498671641 +0000

Merge "Log an error when loading an icon fails" into ub-launcher3-dorval-polish
am: 59fbea393b

Change-Id: I78a41165348675240ad7970aec6dfd6f69dca6e8