tree dc7d292453d119687cd286c057875292eb491040
parent f1434e9a8b871f5a6dd2dabc60b225dac11f927a
parent cd7c775ece6854765ae3208818e76d9d11724713
author The Android Automerger <android-build@android.com> 1283295890 -0700
committer The Android Automerger <android-build@android.com> 1283295890 -0700

Merge branch 'gingerbread' into gingerbread-release