summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-08-04 11:53:34 +0000
committerYongqin Liu <yongqin.liu@linaro.org>2015-08-06 20:28:36 +0800
commitf1a5715b2bed607eba8839222110a0d47e03ee66 (patch)
tree584fa7bca7a86ec44ce45b21f02e2396eaa95f25
parenta9b70fccb3eaab49ca06f793b756224e52502b3b (diff)
downloadandroid-patchsets-f1a5715b2bed607eba8839222110a0d47e03ee66.tar.gz
Revert "LOLLIPOP-MLCR-PATCHSET: patches for applying chromium changes on zlib to external/zlib"
This reverts commit 4168151375bb6caee29eacd4910eb41277f05db4. Change-Id: I364b1aac2f91b1a9c4742eda93931b34d6191599 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--.gitreview2
-rwxr-xr-xLOLLIPOP-MLCR-PATCHSET3
2 files changed, 1 insertions, 4 deletions
diff --git a/.gitreview b/.gitreview
index ddb0674..60fe12d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
-host=review.android.git.linaro.org
+host=android-review.linaro.org
port=29418
project=android-patchsets.git
diff --git a/LOLLIPOP-MLCR-PATCHSET b/LOLLIPOP-MLCR-PATCHSET
index 73bf36f..c4babba 100755
--- a/LOLLIPOP-MLCR-PATCHSET
+++ b/LOLLIPOP-MLCR-PATCHSET
@@ -102,6 +102,3 @@ apply --linaro external/chromium_org 15960/5
apply --linaro external/chromium_org/third_party/ots 15957/2
apply --linaro external/chromium_org/third_party/freetype 15958/1
apply --linaro external/chromium_org/third_party/WebKit 15959/2
-apply --linaro frameworks/base 15963/1
-apply --linaro external/zlib 15978/1
-apply --linaro external/chromium_org 15980/1