tree 53cbe490f9bb315ff5f740215c8cda6059677d53
parent 7cee9e3bba89925103e2485e22d05335506ed785
parent 03ab95721f14ab81b6fc39d7fc2f18e0c388ea6d
author Tony Wickham <twickham@google.com> 1494977687 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494977692 +0000

Merge changes from topic 'badge-color' into ub-launcher3-master

* changes:
  Fix merge conflicts
  Use a single color for all icon badges.