Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d

diff --cc default.xml
index 17d2746,48e89da..876e0e4
--- 1/default.xml
--- 2/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" />