manifest: fix merge error
Change-Id: I6ece658cfc03a2343db1b2e614df608024488e39
This commit is contained in:
parent
5ae0e79dd0
commit
17e825874d
1 changed files with 0 additions and 5 deletions
|
@ -618,14 +618,9 @@
|
|||
<project path="tools/test/connectivity" name="platform/tools/test/connectivity" groups="pdk" />
|
||||
<project path="tools/tradefederation/core" name="platform/tools/tradefederation" groups="pdk,tradefed" />
|
||||
<project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" groups="pdk,tradefed" />
|
||||
<<<<<<< HEAD
|
||||
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
|
||||
|
||||
<!-- OmniROM -->
|
||||
<include name="omni-default.xml" />
|
||||
=======
|
||||
|
||||
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
|
||||
>>>>>>> android-8.1.0_r42
|
||||
|
||||
</manifest>
|
||||
|
|
Loading…
Reference in a new issue