Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 358f0d4fc8 to master

Browse Source 
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
This commit is contained in:
Jeff Sharkey
2020-12-08 10:57:50 -07:00
parent 0ace970e19 358f0d4fc8
commit 0ab7007631
394 changed files with 1064 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/utils/testutils/java/com/android/server/accessibility/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /core/java/android/view/accessibility/OWNERS

1
tests/utils/testutils/java/com/android/server/wm/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /services/core/java/com/android/server/wm/OWNERS