tree f79233973b04f86293eddb1b9141da01921e34a6
parent 8acf8b506d8c5db2ddcac825a24d0a3bda9fe100
parent d315d07aeef260ef72d57c3e04361c4106d817be
author Tony Wickham <twickham@google.com> 1494977902 +0000
committer android-build-merger <android-build-merger@google.com> 1494977902 +0000

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

Change-Id: Id23914cbee040f3916257e02a9eb6b3f5a821b83