|
|
@@ -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>
|
maxwen