Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
This commit is contained in:
Jean-Baptiste Queru 2011-09-28 15:47:46 -07:00
commit c023083d45

View file

@ -2,7 +2,7 @@
<manifest> <manifest>
<remote name="aosp" <remote name="aosp"
fetch="https://android.googlesource.com/" /> fetch=".." />
<default revision="master" <default revision="master"
remote="aosp" remote="aosp"
sync-j="4" /> sync-j="4" />