From fe1ecb56c575480ce800ba620063d6fed689d897 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <dan.pasanen@gmail.com>
Date: Sat, 9 Dec 2017 07:43:38 -0600
Subject: [PATCH 1/2] android-7.1.2_r29 -> android-7.1.2_r36

Change-Id: Ic66280d226141f27af5fbbb3cf11e4b8fb469dcc

Conflicts:
	default.xml
---
 default.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/default.xml b/default.xml
index 24a9da0..5a10410 100644
--- a/default.xml
+++ b/default.xml
@@ -11,7 +11,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-	   revision="refs/tags/android-7.1.2_r29" />  
+           revision="refs/tags/android-7.1.2_r36" /> 
 
   <remote  name="coltos"
            fetch=".."
@@ -20,6 +20,7 @@
            review="review.lineageos.org"
            revision="refs/heads/cos7.x" />
 
+           
   <default revision="refs/heads/cm-14.1"
            remote="github"
            sync-c="true"
@@ -158,7 +159,6 @@
   <project path="external/jdiff" name="platform/external/jdiff" groups="pdk" remote="aosp" />
   <project path="external/jemalloc" name="LineageOS/android_external_jemalloc" groups="pdk" />
   <project path="external/jetty" name="platform/external/jetty" groups="pdk" remote="aosp" />
-  <project path="external/jhead" name="platform/external/jhead" groups="pdk" remote="aosp" />
   <project path="external/jline" name="platform/external/jline" groups="notdefault,tradefed,pdk-fs" remote="aosp" />
   <project path="external/jmdns" name="platform/external/jmdns" groups="pdk" remote="aosp" />
   <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" groups="pdk" remote="aosp" />
@@ -183,7 +183,6 @@
   <project path="external/libdaemon" name="platform/external/libdaemon" groups="pdk" remote="aosp" />
   <project path="external/libevent" name="platform/external/libevent" groups="pdk" remote="aosp" />
   <project path="external/libexif" name="platform/external/libexif" groups="pdk" remote="aosp" />
-  <project path="external/libgdx" name="platform/external/libgdx" groups="pdk" remote="aosp" />
   <project path="external/libgsm" name="platform/external/libgsm" groups="pdk" remote="aosp" />
   <project path="external/libhevc" name="LineageOS/android_external_libhevc" groups="pdk" />
   <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk" remote="aosp" />

From d7b48641fa9ff5175818aec6850ee238792a9402 Mon Sep 17 00:00:00 2001
From: Sean McCreary <mccreary@mcwest.org>
Date: Sat, 13 Jan 2018 22:27:07 -0700
Subject: [PATCH 2/2] manifest: Track our frameworks/ex fork

Google has moved on from Nougat :-(

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

diff --git a/default.xml b/default.xml
index 5a10410..4eb11c0 100644
--- a/default.xml
+++ b/default.xml
@@ -312,7 +312,7 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" remote="aosp" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" remote="aosp" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" remote="aosp" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="frameworks/ex" name="LineageOS/android_frameworks_ex" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/minikin" name="LineageOS/android_frameworks_minikin" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/ml" name="platform/frameworks/ml" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="frameworks/multidex" name="platform/frameworks/multidex" groups="pdk-cw-fs,pdk-fs" remote="aosp" />