tree 1c6f9dc62fe0130ffb9953797b2b35c09facbe8a
parent efa0ff8ea6b6c6b7e0eefff152b3aa50c51806bf
parent 5bbba815fd59c47ddfdee2dad8266d50dc5b182a
author Tony Wickham <twickham@google.com> 1488392146 +0000
committer android-build-merger <android-build-merger@google.com> 1488392146 +0000

Merge "Respect badge settings to filter out badges" into ub-launcher3-dorval
am: 5bbba815fd

Change-Id: I76a153ab357c5597758aac11348f1e304495fd70