From cb41852f270e20c586ecad0fa9793127d4952551 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 9 Apr 2015 16:36:40 -0400
Subject: [PATCH 01/33] nAOSP: add default repository

---
 default.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/default.xml b/default.xml
index 1f013ec..08db78a 100644
--- a/default.xml
+++ b/default.xml
@@ -3,6 +3,11 @@
 
   <remote  name="aosp"
            fetch=".." />
+
+  <remote name="mickybart"
+           fetch="https://github.com/mickybart" 
+           revision="refs/heads/nAOSP-5.1" />
+
   <default revision="refs/tags/android-5.1.0_r3"
            remote="aosp"
            sync-j="4" />

From 7aecf7d1f99f4ab53972daba84653d74cb0b2d95 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 9 Apr 2015 16:37:40 -0400
Subject: [PATCH 02/33] fuji: device specific

---
 default.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/default.xml b/default.xml
index 08db78a..4041862 100644
--- a/default.xml
+++ b/default.xml
@@ -516,4 +516,10 @@
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
   <project path="tools/tradefederation" name="platform/tools/tradefederation" groups="notdefault,tradefed" />
 
+  <!-- Sony Xperia S / Nozomi  -->
+ 
+  <project path="device/sony/dash" name="device_sony_dash" remote="mickybart" />
+  <project path="device/sony/nozomi" name="device_sony_nozomi" remote="mickybart" />
+  <project path="kernel/msm" name="kernel_sony_msm8x60" remote="mickybart" revision="android-msm-sony-fuji-3.4-nAOSP-5.1" />
+  <project path="vendor/sony/nozomi" name="vendor_sony_nozomi" remote="mickybart" />
 </manifest>

From c44d28f5127123c5319e30454b1b40ea49a7a865 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 9 Apr 2015 16:38:52 -0400
Subject: [PATCH 03/33] gcc: 4.7

---
 default.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default.xml b/default.xml
index 4041862..9061805 100644
--- a/default.xml
+++ b/default.xml
@@ -521,5 +521,7 @@
   <project path="device/sony/dash" name="device_sony_dash" remote="mickybart" />
   <project path="device/sony/nozomi" name="device_sony_nozomi" remote="mickybart" />
   <project path="kernel/msm" name="kernel_sony_msm8x60" remote="mickybart" revision="android-msm-sony-fuji-3.4-nAOSP-5.1" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
   <project path="vendor/sony/nozomi" name="vendor_sony_nozomi" remote="mickybart" />
 </manifest>

From 1a2b6f654716d1a793302b04ac5a311b033a66b6 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 9 Apr 2015 16:40:10 -0400
Subject: [PATCH 04/33] slim: remove darwin and aarch64

---
 default.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default.xml b/default.xml
index 9061805..43a321a 100644
--- a/default.xml
+++ b/default.xml
@@ -460,6 +460,7 @@
   <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="pdk" />
   <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
   <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />
+  <!--
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.8" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.8" groups="pdk,darwin,arm" />
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm" />
   <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" groups="pdk,darwin,arm" />
@@ -473,6 +474,7 @@
   <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="master" groups="pdk,darwin,x86" />
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" groups="pdk,linux,arm" />
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm" />
+  -->
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" groups="pdk,linux,arm" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" groups="pdk,linux" />

From 71eb54bbc599ac02f04bda47bf56c6ce8af638cc Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 9 Apr 2015 19:41:47 -0400
Subject: [PATCH 05/33] Browser, Gallery, Eleven and AudioFX from CyanogenMod

---
 default.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/default.xml b/default.xml
index 43a321a..8b3637d 100644
--- a/default.xml
+++ b/default.xml
@@ -8,6 +8,10 @@
            fetch="https://github.com/mickybart" 
            revision="refs/heads/nAOSP-5.1" />
 
+  <remote  name="cm"
+           fetch="https://github.com/CyanogenMod"
+           revision="refs/heads/cm-12.0" />
+
   <default revision="refs/tags/android-5.1.0_r3"
            remote="aosp"
            sync-j="4" />
@@ -384,7 +388,7 @@
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" />
   <project path="packages/apps/FMRadio" name="platform/packages/apps/FMRadio" />
   <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" />
+  <!-- <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" /> -->
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
   <project path="packages/apps/InCallUI" name="platform/packages/apps/InCallUI" />
   <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
@@ -393,8 +397,8 @@
   <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
   <project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" />
   <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
+  <!-- <project path="packages/apps/Music" name="platform/packages/apps/Music" /> -->
+  <!-- <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" /> -->
   <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
   <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" />
   <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
@@ -526,4 +530,11 @@
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
   <project path="vendor/sony/nozomi" name="vendor_sony_nozomi" remote="mickybart" />
+
+  <!-- from CyanogenMod -->
+  <project path="external/android-visualizer" name="android_external_android-visualizer" remote="cm" />
+  <project path="packages/apps/Browser" name="android_packages_apps_Browser" remote="cm" />
+  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" />
+  <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
+  <project path="packages/apps/AudioFX" name="android_packages_apps_AudioFX" remote="cm" />
 </manifest>

From 3550b5909e6ba0d5478aea608170a5a65c8006d5 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 11 Apr 2015 09:37:15 -0400
Subject: [PATCH 06/33] readme

---
 README.mkdn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 README.mkdn

diff --git a/README.mkdn b/README.mkdn
new file mode 100644
index 0000000..a46f7eb
--- /dev/null
+++ b/README.mkdn
@@ -0,0 +1,23 @@
+nAOSP 5.1 for Sony Xperia S
+
+near AOSP ROM 5.1
+
+The purpose of this ROM is to provide support for Xperia S.
+
+Build process :
+
+    repo init -u https://github.com/mickybart/android_manifest -b nAOSP-5.1
+    repo sync
+    cd device/sony/nozomi/patch
+    ./aosp-patch-apply.sh <path to the source code>
+    cd -
+    source build/envsetup.sh
+    lunch aosp_nozomi-userdebug
+    make otapackage
+
+Update a previous build (resync) :
+
+    ./aosp-patch-unapply.sh <path to the source code>
+    repo sync
+    ./aosp-patch-apply.sh <path to the source code>   (eventually merge manually in case of conflict)
+

From 695d44ad7aa87f3e711adc7aca523c8657523f39 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 11 Apr 2015 09:43:32 -0400
Subject: [PATCH 07/33] aosp: set fetch

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 8b3637d..090be95 100644
--- a/default.xml
+++ b/default.xml
@@ -2,7 +2,7 @@
 <manifest>
 
   <remote  name="aosp"
-           fetch=".." />
+           fetch="https://android.googlesource.com" />
 
   <remote name="mickybart"
            fetch="https://github.com/mickybart" 

From 77bb9c5681ff62eccf656061e50b663e7037b84c Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 11 Apr 2015 09:46:50 -0400
Subject: [PATCH 08/33] Browser: fix conflict with CM repo

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 090be95..c0f31b7 100644
--- a/default.xml
+++ b/default.xml
@@ -373,7 +373,7 @@
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
   <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="pdk-cw-fs" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
+  <!-- <project path="packages/apps/Browser" name="platform/packages/apps/Browser" /> -->
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />

From 2b87ec654f3a532b8a7c77d9ddd1790a8cc431b9 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sun, 12 Apr 2015 08:57:12 -0400
Subject: [PATCH 09/33] add busybox and superuser

---
 default.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/default.xml b/default.xml
index c0f31b7..db40c61 100644
--- a/default.xml
+++ b/default.xml
@@ -537,4 +537,9 @@
   <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" />
   <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
   <project path="packages/apps/AudioFX" name="android_packages_apps_AudioFX" remote="cm" />
+
+  <!-- 3rd -->
+  <project path="external/busybox" name="android_external_busybox" remote="mickybart" />
+  <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
+  <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
 </manifest>

From 59b8ab2e669ec925f3c31584abb1a17e81fb3612 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Mon, 13 Apr 2015 19:00:25 -0400
Subject: [PATCH 10/33] audio: remove AudioFX

---
 default.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/default.xml b/default.xml
index db40c61..a6eccff 100644
--- a/default.xml
+++ b/default.xml
@@ -536,7 +536,6 @@
   <project path="packages/apps/Browser" name="android_packages_apps_Browser" remote="cm" />
   <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" />
   <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
-  <project path="packages/apps/AudioFX" name="android_packages_apps_AudioFX" remote="cm" />
 
   <!-- 3rd -->
   <project path="external/busybox" name="android_external_busybox" remote="mickybart" />

From e8060f040a40a0fd273db1128b9c456409d31d26 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Tue, 14 Apr 2015 08:38:09 -0400
Subject: [PATCH 11/33] slim: remove devices unused

---
 default.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 403d113..336b3a0 100644
--- a/default.xml
+++ b/default.xml
@@ -31,6 +31,7 @@
   <project path="developers/docs" name="platform/developers/docs" />
   <project path="developers/samples/android" name="platform/developers/samples/android" />
   <project path="development" name="platform/development" groups="pdk-cw-fs" />
+  <!--
   <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" />
   <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" />
   <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" clone-depth="1" />
@@ -38,6 +39,7 @@
   <project path="device/asus/fugu-kernel" name="device/asus/fugu-kernel" groups="device,fugu" clone-depth="1" />
   <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" />
   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" />
+  -->
   <project path="device/common" name="device/common" groups="pdk-cw-fs" />
   <project path="device/generic/arm64" name="device/generic/arm64" groups="pdk" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
@@ -52,6 +54,7 @@
   <project path="device/generic/qemu" name="device/generic/qemu" />
   <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
   <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" />
+  <!--
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/google/atv" name="device/google/atv" groups="device,fugu" />
@@ -63,8 +66,9 @@
   <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,mako" clone-depth="1" />
   <project path="device/moto/shamu" name="device/moto/shamu" groups="device,shamu" />
   <project path="device/moto/shamu-kernel" name="device/moto/shamu-kernel" groups="device,shamu" clone-depth="1" />
+  -->
   <project path="device/sample" name="device/sample" groups="pdk" />
-  <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" />
+  <!-- <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" /> -->
   <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="pdk-cw-fs" />
   <project path="external/aac" name="platform/external/aac" groups="pdk" />
   <project path="external/android-clat" name="platform/external/android-clat" groups="pdk-cw-fs" />

From 8b76c54f7e55cf1c0918a82c41122be1d62ae8f7 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Fri, 24 Apr 2015 20:47:43 -0400
Subject: [PATCH 12/33] WakeUp: permit to manage wake gesture

---
 default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.xml b/default.xml
index 5773036..e565b6d 100644
--- a/default.xml
+++ b/default.xml
@@ -545,4 +545,5 @@
   <project path="external/busybox" name="android_external_busybox" remote="mickybart" />
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
+  <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
 </manifest>

From 74009b0d163d6f9eb385c142798a0eef470e2ca0 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Fri, 8 May 2015 11:45:55 -0400
Subject: [PATCH 13/33] FMRadio: switch to custom for nozomi

---
 default.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index e565b6d..9fd9a44 100644
--- a/default.xml
+++ b/default.xml
@@ -390,7 +390,7 @@
   <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" />
   <project path="packages/apps/Email" name="platform/packages/apps/Email" />
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" />
-  <project path="packages/apps/FMRadio" name="platform/packages/apps/FMRadio" />
+  <!-- <project path="packages/apps/FMRadio" name="platform/packages/apps/FMRadio" /> -->
   <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
   <!-- <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" /> -->
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
@@ -545,5 +545,6 @@
   <project path="external/busybox" name="android_external_busybox" remote="mickybart" />
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
+  <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />
   <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
 </manifest>

From e98421969b8f74bc1d14250b84cf889d5247f8d5 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Tue, 9 Jun 2015 16:55:20 -0400
Subject: [PATCH 14/33] thermanager: replace proprietary thermald

---
 default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.xml b/default.xml
index 9fd9a44..68f0ecd 100644
--- a/default.xml
+++ b/default.xml
@@ -530,6 +530,7 @@
  
   <project path="device/sony/dash" name="device_sony_dash" remote="mickybart" />
   <project path="device/sony/nozomi" name="device_sony_nozomi" remote="mickybart" />
+  <project path="device/sony/thermanager" name="device_sony_thermanager" remote="mickybart" revision="master" />
   <project path="kernel/msm" name="kernel_sony_msm8x60" remote="mickybart" revision="android-msm-sony-fuji-3.4-nAOSP-5.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />

From 3bbfea248786ac79549b6fcb603571daca15d3c6 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 2 Jul 2015 11:32:30 -0400
Subject: [PATCH 15/33] app: audio: ViPER4Android FX

---
 default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.xml b/default.xml
index c73238a..e926d9e 100644
--- a/default.xml
+++ b/default.xml
@@ -547,5 +547,6 @@
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />
+  <project path="packages/apps/ViPER4AndroidFX" name="android_packages_apps_ViPER4AndroidFX" remote="mickybart" revision="refs/heads/master" />
   <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
 </manifest>

From eaca879c8031eda29d2e7682d9a9d9fe117620ce Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 2 Jul 2015 11:33:34 -0400
Subject: [PATCH 16/33] Revert "Manifest for Android 5.1.1 release 5"

This reverts commit 23c7f3cb9c6e05b113f5d11ca9006ccf1fdd1e0c.
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index e926d9e..9c7fabf 100644
--- a/default.xml
+++ b/default.xml
@@ -12,7 +12,7 @@
            fetch="https://github.com/CyanogenMod"
            revision="refs/heads/cm-12.0" />
 
-  <default revision="refs/tags/android-5.1.1_r5"
+  <default revision="refs/tags/android-5.1.1_r4"
            remote="aosp"
            sync-j="4" />
 

From 8a6539d6e0b7fea762134fb86c9966f769ddd114 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Wed, 29 Jul 2015 15:22:59 -0400
Subject: [PATCH 17/33] repo: switch recovery to twrp

---
 default.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default.xml b/default.xml
index 557834e..0dc735b 100644
--- a/default.xml
+++ b/default.xml
@@ -23,7 +23,9 @@
   <project path="art" name="platform/art" groups="pdk" />
   <project path="bionic" name="platform/bionic" groups="pdk" />
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="pdk-cw-fs" />
+  <!--
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
+  -->
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs" />
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs" />
   <project path="developers/build" name="platform/developers/build" />
@@ -543,6 +545,7 @@
   <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
 
   <!-- 3rd -->
+  <project path="bootable/recovery" name="android_bootable_recovery" remote="mickybart" />
   <project path="external/busybox" name="android_external_busybox" remote="mickybart" />
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />

From 7e381b0cb7f7ef0bf68f4f9c40c09182f6eaac6c Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 5 Aug 2015 14:09:52 -0700
Subject: [PATCH 18/33] Manifest for Android 5.1.1 release 9

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 4831278..cab13b2 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r6"
+  <default revision="refs/tags/android-5.1.1_r9"
            remote="aosp"
            sync-j="4" />
 

From b9b1da1e33938eec5b22be2f84fd0045603d78b9 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 6 Aug 2015 09:30:12 -0400
Subject: [PATCH 19/33] switch to official repo: ViPER4Android (patch needed
 for nAOSProm merged upstream)

---
 default.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index f21afd2..65fd7b7 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com" />
 
-  <remote name="mickybart"
+  <remote  name="mickybart"
            fetch="https://github.com/mickybart" 
            revision="refs/heads/nAOSP-5.1" />
 
@@ -12,6 +12,10 @@
            fetch="https://github.com/CyanogenMod"
            revision="refs/heads/cm-12.0" />
 
+  <remote  name="v4a"
+           fetch="https://github.com/vipersaudio"
+           revision="refs/heads/master" />
+
   <default revision="refs/tags/android-5.1.1_r9"
            remote="aosp"
            sync-j="4" />
@@ -550,6 +554,6 @@
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />
-  <project path="packages/apps/ViPER4AndroidFX" name="android_packages_apps_ViPER4AndroidFX" remote="mickybart" revision="refs/heads/master" />
+  <project path="packages/apps/ViPER4AndroidFX" name="viper4android_fx" remote="v4a" />
   <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
 </manifest>

From 00cf38162c422df2919308b0b34bf2daae5212cf Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Tue, 11 Aug 2015 12:33:17 -0400
Subject: [PATCH 20/33] switch repositories not managed anymore by the patch
 script

---
 default.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/default.xml b/default.xml
index 65fd7b7..ca67184 100644
--- a/default.xml
+++ b/default.xml
@@ -302,7 +302,7 @@
   <project path="external/zopfli" name="platform/external/zopfli" groups="pdk-cw-fs" />
   <project path="external/zxing" name="platform/external/zxing" groups="pdk-cw-fs" />
   <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" />
-  <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs" />
+  <!-- <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs" /> -->
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" />
@@ -390,17 +390,17 @@
   <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" />
+  <!-- <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" /> -->
+  <!-- <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" /> -->
   <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" />
+  <!-- <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" /> -->
   <project path="packages/apps/Email" name="platform/packages/apps/Email" />
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" />
   <!-- <project path="packages/apps/FMRadio" name="platform/packages/apps/FMRadio" /> -->
   <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
   <!-- <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" /> -->
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/InCallUI" name="platform/packages/apps/InCallUI" />
+  <!-- <project path="packages/apps/InCallUI" name="platform/packages/apps/InCallUI" /> -->
   <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
   <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
   <project path="packages/apps/Launcher3" name="platform/packages/apps/Launcher3" />
@@ -417,7 +417,7 @@
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" />
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+  <!-- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> -->
   <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
   <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
   <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" />
@@ -548,6 +548,14 @@
   <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" />
   <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
 
+  <!-- for repositories not managed by the patch script -->
+  <project path="frameworks/base" name="android_frameworks_base" remote="mickybart" />
+  <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="mickybart" />
+  <project path="packages/apps/ContactsCommon" name="android_packages_apps_ContactsCommon" remote="mickybart" />
+  <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="mickybart" />
+  <project path="packages/apps/InCallUI" name="android_packages_apps_InCallUI" remote="mickybart" />
+  <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="mickybart" />
+
   <!-- 3rd -->
   <project path="bootable/recovery" name="android_bootable_recovery" remote="mickybart" />
   <project path="external/busybox" name="android_external_busybox" remote="mickybart" />

From 9f5ada7e66c6c4f62bc33007dc9f99ba0230e641 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Tue, 11 Aug 2015 22:11:09 -0400
Subject: [PATCH 21/33] move from cm-12.0 to cm-12.1 if possible

---
 default.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.xml b/default.xml
index ca67184..222fd6a 100644
--- a/default.xml
+++ b/default.xml
@@ -10,7 +10,7 @@
 
   <remote  name="cm"
            fetch="https://github.com/CyanogenMod"
-           revision="refs/heads/cm-12.0" />
+           revision="refs/heads/cm-12.1" />
 
   <remote  name="v4a"
            fetch="https://github.com/vipersaudio"
@@ -544,8 +544,9 @@
 
   <!-- from CyanogenMod -->
   <project path="external/android-visualizer" name="android_external_android-visualizer" remote="cm" />
+  <project path="external/busybox" name="android_external_busybox" remote="cm" />
   <project path="packages/apps/Browser" name="android_packages_apps_Browser" remote="cm" />
-  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" />
+  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="cm" revision="refs/heads/cm-12.0" />
   <project path="packages/apps/Eleven" name="android_packages_apps_Eleven" remote="cm" />
 
   <!-- for repositories not managed by the patch script -->
@@ -558,7 +559,6 @@
 
   <!-- 3rd -->
   <project path="bootable/recovery" name="android_bootable_recovery" remote="mickybart" />
-  <project path="external/busybox" name="android_external_busybox" remote="mickybart" />
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />

From 6053a232feae4f07d1da97ce81d3a33ed1c50038 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Nov 2015 14:14:39 -0800
Subject: [PATCH 22/33] Manifest for Android 5.1.1 release 25

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 95b3778..cc7fcbb 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r24"
+  <default revision="refs/tags/android-5.1.1_r25"
            remote="aosp"
            sync-j="4" />
 

From abbafacc74994817b547e66c919cf73992c65f1e Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Nov 2015 14:17:41 -0800
Subject: [PATCH 23/33] Manifest for Android 5.1.1 release 26

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index cc7fcbb..6e64dda 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r25"
+  <default revision="refs/tags/android-5.1.1_r26"
            remote="aosp"
            sync-j="4" />
 

From 88019792b0b2bdbc297f9263f189ca234641c8be Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Nov 2015 14:38:15 -0800
Subject: [PATCH 24/33] Manifest for Android 5.1.1 release 28

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 6e64dda..faba472 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r26"
+  <default revision="refs/tags/android-5.1.1_r28"
            remote="aosp"
            sync-j="4" />
 

From 2873dcc5de88d750f1e0c8f977ffaa0dc12afadc Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 6 Nov 2015 14:29:27 -0800
Subject: [PATCH 25/33] Manifest for Android 5.1.1 release 29

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index faba472..7e938a2 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r28"
+  <default revision="refs/tags/android-5.1.1_r29"
            remote="aosp"
            sync-j="4" />
 

From 8edd4763d65bf58cf8761ae26888c20b68131ded Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 7 Dec 2015 11:09:00 -0800
Subject: [PATCH 26/33] Manifest for Android 5.1.1 release 30

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 7e938a2..8e58b79 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r29"
+  <default revision="refs/tags/android-5.1.1_r30"
            remote="aosp"
            sync-j="4" />
 

From 5bf0fa74bdcbc23a0378c175254ea8dba2319abb Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 4 Jan 2016 12:37:35 -0800
Subject: [PATCH 27/33] Manifest for Android 5.1.1 Release 33

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 8e58b79..1d52859 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r30"
+  <default revision="refs/tags/android-5.1.1_r33"
            remote="aosp"
            sync-j="4" />
 

From 055e1ca1ee32d1636a9c3b346de435681cd544fd Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Mon, 11 Jan 2016 07:48:51 -0500
Subject: [PATCH 28/33] prebuilt webview support

---
 default.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/default.xml b/default.xml
index 7011d34..65bdded 100644
--- a/default.xml
+++ b/default.xml
@@ -8,6 +8,10 @@
            fetch="https://github.com/mickybart" 
            revision="refs/heads/nAOSP-5.1" />
 
+  <remote name="ipromeh"
+           fetch="https://github.com/ipromeh"
+           revision="refs/heads/lp5.1" />
+
   <remote  name="cm"
            fetch="https://github.com/CyanogenMod"
            revision="refs/heads/cm-12.1" />
@@ -335,7 +339,9 @@
   <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" />
   <project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs" />
   <project path="frameworks/volley" name="platform/frameworks/volley" groups="pdk-cw-fs" />
+  <!--
   <project path="frameworks/webview" name="platform/frameworks/webview" groups="pdk-cw-fs" />
+  -->
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="pdk-cw-fs" />
   <project path="hardware/akm" name="platform/hardware/akm" />
   <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" />
@@ -564,4 +570,7 @@
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />
   <project path="packages/apps/ViPER4AndroidFX" name="viper4android_fx" remote="v4a" />
   <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
+
+  <!-- for prebuilt webview by Google -->
+  <project path="frameworks/webview" name="android_frameworks_webview" groups="pdk-cw-fs" remote="ipromeh" />
 </manifest>

From 407328819a9372445b2711c2be3e242a3915f414 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 1 Feb 2016 13:11:52 -0800
Subject: [PATCH 29/33] Manifest for Android 5.1.1 Release 34

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 1d52859..36cfbce 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r33"
+  <default revision="refs/tags/android-5.1.1_r34"
            remote="aosp"
            sync-j="4" />
 

From 5d692d942ac285a905f8cd7b6f34d043b9304cd2 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Thu, 25 Feb 2016 10:32:17 +0100
Subject: [PATCH 30/33] Support OTA update with ROM Updater

---
 default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.xml b/default.xml
index 99e02d3..2b32a76 100644
--- a/default.xml
+++ b/default.xml
@@ -568,6 +568,7 @@
   <project path="external/koush/Superuser" name="android_external_koush_Superuser" remote="mickybart" />
   <project path="external/koush/Widgets" name="android_external_koush_Widgets" remote="mickybart" />
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="mickybart" revision="refs/heads/nozomi" />
+  <project path="packages/apps/ROMUpdater" name="android_packages_apps_ROMUpdater" remote="mickybart" />
   <project path="packages/apps/ViPER4AndroidFX" name="viper4android_fx" remote="v4a" />
   <project path="packages/apps/WakeUp" name="android_packages_apps_WakeUp" remote="mickybart" revision="refs/heads/master" />
 

From 99c0f427abc3263a2ee460dfea40b5e18e865823 Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Mon, 29 Feb 2016 09:41:01 +0100
Subject: [PATCH 31/33] include hikari

---
 README.mkdn | 6 +++---
 default.xml | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.mkdn b/README.mkdn
index a46f7eb..bbf3e6d 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -1,8 +1,8 @@
-nAOSP 5.1 for Sony Xperia S
+nAOSP 5.1 for Sony Xperia S / Acro S
 
 near AOSP ROM 5.1
 
-The purpose of this ROM is to provide support for Xperia S.
+The purpose of this ROM is to provide support for Xperia S and Acro S
 
 Build process :
 
@@ -12,7 +12,7 @@ Build process :
     ./aosp-patch-apply.sh <path to the source code>
     cd -
     source build/envsetup.sh
-    lunch aosp_nozomi-userdebug
+    lunch aosp_nozomi-userdebug   (aosp_hikari-userdebug for Acro S)
     make otapackage
 
 Update a previous build (resync) :
diff --git a/default.xml b/default.xml
index 2b32a76..654d0a5 100644
--- a/default.xml
+++ b/default.xml
@@ -541,11 +541,13 @@
   <!-- Sony Xperia S / Nozomi  -->
  
   <project path="device/sony/dash" name="device_sony_dash" remote="mickybart" />
+  <project path="device/sony/hikari" name="device_sony_nozomi" remote="mickybart" revision="refs/heads/nAOSP-5.1-hikari" />
   <project path="device/sony/nozomi" name="device_sony_nozomi" remote="mickybart" />
   <project path="device/sony/thermanager" name="device_sony_thermanager" remote="mickybart" revision="master" />
   <project path="kernel/msm" name="kernel_sony_msm8x60" remote="mickybart" revision="android-msm-sony-fuji-3.4-nAOSP-5.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm" remote="aosp" revision="refs/tags/android-4.4.4_r2.0.1" />
+  <project path="vendor/sony/hikari" name="vendor_sony_nozomi" remote="mickybart" revision="refs/heads/nAOSP-5.1-hikari" />
   <project path="vendor/sony/nozomi" name="vendor_sony_nozomi" remote="mickybart" />
 
   <!-- from CyanogenMod -->

From 28056e1e0b77111a0bcd915ed4f8908da21cb6d5 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 7 Mar 2016 12:46:47 -0800
Subject: [PATCH 32/33] Manifest for Android 5.1.1 Release 35

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 36cfbce..072a0f7 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r34"
+  <default revision="refs/tags/android-5.1.1_r35"
            remote="aosp"
            sync-j="4" />
 

From 55e4a7de6542b5f0114ae03299de910fd6f59cfe Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 10 Mar 2016 17:25:18 -0800
Subject: [PATCH 33/33] Manifest for Android 5.1.1 Release 36

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 072a0f7..59e1a88 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
 
   <remote  name="aosp"
            fetch=".." />
-  <default revision="refs/tags/android-5.1.1_r35"
+  <default revision="refs/tags/android-5.1.1_r36"
            remote="aosp"
            sync-j="4" />