resolve merge conflicts of cf895ccc2 to ub-launcher3-master

Browse Source

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9f60c248455d2c672fb70524111c169803312c48

...

This commit is contained in:

Tony Wickham

2017-04-20 15:35:38 -07:00

parent dbfc9014fe cf895ccc2c

commit 2feac00e2b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available