resolve merge conflicts of d9d21afdd4 to qt-qpr1-dev-plus-aosp

Browse Source

Change-Id: I59ed1086133919e4cf3594128a65ff85bdcc6651

...

This commit is contained in:

Jay Aliomer

2020-03-02 23:40:00 +00:00

parent 97316e6c08 d9d21afdd4

commit e355e97c50

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