summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2010-04-08 08:27:21 -0700
committerThe Android Automerger <android-build@android.com>2010-04-08 08:27:21 -0700
commit617cd2cef515ea8963a3dd763bc0228b2abbf2fc (patch)
tree9e0fa3c842110e9b2295609687f7be320eae5bb8
parent163f0f235856325f37477e463626cdfbd67cc7a8 (diff)
parentc75afb3e8ae58b1a7e0a99f6f29c9c514afc5317 (diff)
downloadframeworks_native-617cd2cef515ea8963a3dd763bc0228b2abbf2fc.zip
frameworks_native-617cd2cef515ea8963a3dd763bc0228b2abbf2fc.tar.gz
frameworks_native-617cd2cef515ea8963a3dd763bc0228b2abbf2fc.tar.bz2
Merge branch 'froyo' into froyo-release
0 files changed, 0 insertions, 0 deletions