From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 28 Sep 2011 22:47:46 +0000 (-0700)
Subject: Merge from gingerbread
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c023083d456700e844348140660ffe431ca448a1;p=android-x86%2Fmanifest.git

Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
---

c023083d456700e844348140660ffe431ca448a1
diff --cc default.xml
index 17d2746,48e89da..876e0e4
--- a/default.xml
+++ b/default.xml
@@@ -2,8 -2,8 +2,8 @@@
  <manifest>
  
    <remote  name="aosp"
-            fetch="https://android.googlesource.com/" />
+            fetch=".." />
 -  <default revision="gingerbread"
 +  <default revision="master"
             remote="aosp"
             sync-j="4" />