Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
diff --git a/default.xml b/default.xml
index 17d2746..876e0e4 100644
--- a/default.xml
+++ b/default.xml
@@ -2,7 +2,7 @@
 <manifest>
 
   <remote  name="aosp"
-           fetch="https://android.googlesource.com/" />
+           fetch=".." />
   <default revision="master"
            remote="aosp"
            sync-j="4" />