tree bf7a853e7806f30253579c00ffeabfa0b98d39bd
parent 31122a5def7fee006a0fe21d7a289b23c9971fd9
parent f555bfa052f0237713ecf65b32291cfa783d8028
author The Android Automerger <android-build@android.com> 1300470102 -0700
committer The Android Automerger <android-build@android.com> 1300470102 -0700

merge in gingerbread-release history after reset to gingerbread