Merge tag 'android-8.1.0_r42' into android-8.1

Android 8.1.0 Release 42

Change-Id: I986e78728cb22c36a9fbbcd91349c502d52cfded
Signed-off-by: Humberto Borba <humberos@omnirom.org>

default.xml

@@ -3,10 +3,11 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.1.0_r40"
+  <default revision="refs/tags/android-8.1.0_r42"
            remote="aosp"
            sync-c="true"
            sync-j="12" />
+
   <project path="build/make" name="platform/build" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
@@ -617,9 +618,14 @@
   <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>