From 70ee73dadc7db726a28b9367654c134f888b98dc Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@gmail.com>
Date: Thu, 10 Nov 2016 14:04:53 +0200
Subject: [PATCH] Revert "Android 7.1.0_r7"

This reverts commit 3523e470cd9a5c7302e4915a049ebedfab6daec7.

Change-Id: I5140622d10cf1609b3638c767727d235810ec22d
---
 default.xml | 4 ++--
 remove.xml  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/default.xml b/default.xml
index 98300e7..2be38d9 100644
--- a/default.xml
+++ b/default.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <remote  name="aosp"
+  <remote name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com" />
-  <default revision="refs/tags/android-7.1.0_r7"
+  <default revision="refs/tags/android-7.1.0_r4"
            remote="aosp"
            sync-c="true"
            sync-j="4" />
diff --git a/remove.xml b/remove.xml
index 8ddc949..ead8d85 100644
--- a/remove.xml
+++ b/remove.xml
@@ -22,8 +22,6 @@
   <remove-project name="device/google/accessory/arduino" />
   <remove-project name="device/google/accessory/demokit" />
   <remove-project name="device/google/atv" />
-  <remove-project name="device/google/marlin" />
-  <remove-project name="device/google/marlin-kernel" />
 
   <remove-project name="device/asus/fugu" />
   <remove-project name="device/asus/fugu-kernel" />