From 551285b9b171ce3d9c4a2b823b86096ba95e134f Mon Sep 17 00:00:00 2001
From: Menno van Grinsven <scanno71@gmail.com>
Date: Thu, 30 Jun 2016 12:52:19 +0200
Subject: [PATCH 1/9] Use the omni repo for dhcpcd

Change-Id: Ic523fb92289863a22012b88f0c8544407f60c8c0
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 030a7f8..c802a15 100644
--- a/default.xml
+++ b/default.xml
@@ -83,7 +83,7 @@
   <project path="external/crcalc" name="platform/external/crcalc" groups="pdk-fs" />
   <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="pdk-cw-fs,pdk-fs" />
+  <project path="external/dhcpcd" name="android_external_dhcpcd" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" />
   <project path="external/doclava" name="platform/external/doclava" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" />

From 719d8bba2c4a49ca22235b88dfcb2b7714390d73 Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Thu, 7 Jul 2016 15:08:30 -0300
Subject: [PATCH 2/9] Android 6.0.1 Release 54 (MTC19Z)

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: Ic7951e609fe02cb22a70d4230610193c98ca050d
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index c802a15..4f3c482 100644
--- a/default.xml
+++ b/default.xml
@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-6.0.1_r46"
+  <default revision="refs/tags/android-6.0.1_r54"
            remote="aosp"
            sync-c="true"
            sync-j="4" />

From e6a49d597f5b0439f70c96b5d3d5ef494c8ff14b Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Thu, 28 Jul 2016 22:36:34 +0200
Subject: [PATCH 3/9] manifest: forked Messaging

Change-Id: I999b9f2235ab18ebb79a28e884a5763416421868
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 4f3c482..f8d744e 100644
--- a/default.xml
+++ b/default.xml
@@ -369,7 +369,7 @@
   <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-6.0" />
   <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
   <project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" />
-  <project path="packages/apps/Messaging" name="platform/packages/apps/Messaging" groups="pdk-fs" />
+  <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-6.0" />
   <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
   <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-6.0" />
   <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-6.0" />

From c4e0a3ff04ea4d5e50add96c9d465ade663c4349 Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Mon, 1 Aug 2016 19:51:16 -0300
Subject: [PATCH 4/9] Android 6.0.1 Release 62 (MTC20F)

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: Ida855376bc89379125de4c1ac550f258dbe2b81e
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index f8d744e..0c4850a 100644
--- a/default.xml
+++ b/default.xml
@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-6.0.1_r54"
+  <default revision="refs/tags/android-6.0.1_r62"
            remote="aosp"
            sync-c="true"
            sync-j="4" />

From 01a161656a5dce0bafb57c5b0512af87b681985d Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Sun, 18 Sep 2016 14:00:23 -0300
Subject: [PATCH 5/9] Android 6.0.1 Release 68

Manifest for Android 6.0.1 Release 68

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: If653c7b53db47e78f75ee89826210cc284fe88f9
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 0c4850a..fe70906 100644
--- a/default.xml
+++ b/default.xml
@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-6.0.1_r62"
+  <default revision="refs/tags/android-6.0.1_r68"
            remote="aosp"
            sync-c="true"
            sync-j="4" />

From 6031aefeccccc27153982fe18a411f310b34afaa Mon Sep 17 00:00:00 2001
From: Menno van Grinsven <scanno71@gmail.com>
Date: Mon, 19 Sep 2016 00:00:09 +0200
Subject: [PATCH 6/9] manifest: track guava and doclava repo's

Change-Id: Iccb36934e3f6df9ff7cf48159a00bd5e1df3d762
---
 default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index fe70906..66dc56d 100644
--- a/default.xml
+++ b/default.xml
@@ -85,7 +85,7 @@
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/dhcpcd" name="android_external_dhcpcd" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" />
-  <project path="external/doclava" name="platform/external/doclava" groups="pdk-cw-fs,pdk-fs" />
+  <project path="external/doclava" name="android_external_doclava" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" />
   <project path="external/drm_gralloc" name="platform/external/drm_gralloc" groups="drm_gralloc" />
   <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" />
@@ -120,7 +120,7 @@
   <project path="external/google-tv-pairing-protocol" name="platform/external/google-tv-pairing-protocol" groups="pdk-fs" />
   <project path="external/gptfdisk" name="platform/external/gptfdisk" groups="pdk-fs" />
   <project path="external/gtest" name="platform/external/gtest" groups="pdk" />
-  <project path="external/guava" name="platform/external/guava" groups="pdk-cw-fs,pdk-fs" />
+  <project path="external/guava" name="android_external_guava" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26" />
   <project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk-fs" />

From 3d36ab755d36cf876bac779307eb57e62bbf5d17 Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Tue, 4 Oct 2016 20:49:25 -0300
Subject: [PATCH 7/9] Android 6.0.1 Release 72 (M4B30X)

Change-Id: I5941fbd2b3dda32a062828ea3b7b82aeac96df91
Signed-off-by: Humberto Borba <humberos@gmail.com>
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 66dc56d..027f750 100644
--- a/default.xml
+++ b/default.xml
@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-6.0.1_r68"
+  <default revision="refs/tags/android-6.0.1_r72"
            remote="aosp"
            sync-c="true"
            sync-j="4" />

From 45cb3c1aebd7682b07a5ea19e8b6a79fbbedfd8d Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Sat, 8 Oct 2016 12:55:20 -0300
Subject: [PATCH 8/9] manifest: Fork external/lzma

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: I40d251adc90a1f2288c08288682e0331069788b9
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 027f750..5b132df 100644
--- a/default.xml
+++ b/default.xml
@@ -187,7 +187,7 @@
   <project path="external/llvm" name="android_external_llvm" remote="omnirom" revision="android-6.0" groups="pdk" />
   <project path="external/ltrace" name="platform/external/ltrace" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/lz4" name="android_external_lz4" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
-  <project path="external/lzma" name="platform/external/lzma" groups="pdk" />
+  <project path="external/lzma" name="android_external_lzma" remote="omnirom" revision="android-6.0" groups="pdk" />
   <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/markdown" name="platform/external/markdown" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" />

From db00adfe201b50d63423f25746da3debbab48174 Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Tue, 8 Nov 2016 20:10:57 -0200
Subject: [PATCH 9/9] Android 6.0.1 release 74 (MOB31K)

Manifest for Android 6.0.1 release 74

Signed-off-by: Humberto Borba <humberos@gmail.com>
Change-Id: Ie703a0add74a848ab93e2e246647543ee5f0c6c7
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 5b132df..c393d75 100644
--- a/default.xml
+++ b/default.xml
@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-6.0.1_r72"
+  <default revision="refs/tags/android-6.0.1_r74"
            remote="aosp"
            sync-c="true"
            sync-j="4" />