tree e1672e15e64511b4e150a9e3b805c4df01bc8623
parent 05d14cb9f03044e11f7c056dae1e576bb5cd3716
parent 2125ea8ccb39fa2b812e4c491e5183c04a3b1eac
author The Android Automerger <android-build@android.com> 1296254703 -0800
committer The Android Automerger <android-build@android.com> 1296254703 -0800

merge in gingerbread-release history after reset to gingerbread