resolve merge conflicts of bff19645ef to sc-dev

Browse Source

Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d

...

This commit is contained in:

Remi NGUYEN VAN

2021-02-01 10:25:24 +00:00

parent 6ab0a5500d bff19645ef

commit a8780c8ea1

74 changed files with 2210 additions and 0 deletions

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

1823

framework/src/android/net/LinkProperties.java Normal file

File diff suppressed because it is too large Load Diff