tree c78d6e7f2ad4af4f3d66c993fe49dbf4b295ba7d
parent 30fe588f6b45c945b0379d009ddd6c7e499ac3d3
parent 69dec8be52164a81e2f9232561ace97b52e9f514
author The Android Automerger <android-build@android.com> 1299959779 -0800
committer The Android Automerger <android-build@android.com> 1299959779 -0800

merge in gingerbread-release history after reset to gingerbread