resolve merge conflicts of 8f843170a4 to qt-qpr1-dev-plus-aosp

Browse Source

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I52368e2d4d0585bb4a3b9401f6b268408952fcc6

...

This commit is contained in:

Pengquan Meng

2019-08-26 00:18:52 -07:00

parent b402c73c4d 8f843170a4

commit 8c1e4e80b1

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