| commit | 1cf5357c9b6066271444e1e8c611f6c9759d3fea | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue May 16 23:34:47 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 16 23:34:52 2017 +0000 |
| tree | 53cbe490f9bb315ff5f740215c8cda6059677d53 | |
| parent | 7cee9e3bba89925103e2485e22d05335506ed785 [diff] | |
| parent | 03ab95721f14ab81b6fc39d7fc2f18e0c388ea6d [diff] |
Merge changes from topic 'badge-color' into ub-launcher3-master * changes: Fix merge conflicts Use a single color for all icon badges.