summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2010-05-05 22:11:36 -0700
committerThe Android Automerger <android-build@android.com>2010-05-05 22:11:36 -0700
commit6151146166f5b306791e9512028c83cf69f7e496 (patch)
treed5b9c248d70a6e79054d6f58b7c5b6a3ccc6c0c1
parentf501d20e6daeb191ef4faf6d6c1f5eeb263e1878 (diff)
parent110ecf05428ee0bcd4657048b3f15daa0f01747e (diff)
downloadframeworks_native-6151146166f5b306791e9512028c83cf69f7e496.zip
frameworks_native-6151146166f5b306791e9512028c83cf69f7e496.tar.gz
frameworks_native-6151146166f5b306791e9512028c83cf69f7e496.tar.bz2
Merge branch 'froyo' into froyo-release
0 files changed, 0 insertions, 0 deletions