tree fc5ae227fadac5aa9fb3b6f3a3d29a8587ef636c
parent 608d0dba8717326319800a78cfa85f3ad08b9549
parent d670b995d28615113687e432f6c098aa4cf7b303
author Tony Wickham <twickham@google.com> 1488391914 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1488391914 +0000

Merge "Respect badge settings to filter out badges" into ub-launcher3-dorval