tree 53cbe490f9bb315ff5f740215c8cda6059677d53
parent 1cf5357c9b6066271444e1e8c611f6c9759d3fea
parent 9863ea5dc7cbda4888fca4976fb4514bf3ddd7e4
author Tony Wickham <twickham@google.com> 1494978021 +0000
committer android-build-merger <android-build-merger@google.com> 1494978021 +0000

Merge "Add setting to turn off icon badging" into ub-launcher3-dorval am: d315d07aee
am: 9863ea5dc7

Change-Id: I9b553e7d76c084ec75ad6e964a835665b14a3316