tree e6036a8d7d33fe754ce77632101be668c519f226
parent a47d23f9bca6887747b469fb24a00e172c5a6642
parent 2d8e5f7de8a74cc937555bfce6e0753d5e8e8165
author The Android Automerger <android-build@android.com> 1299304606 -0800
committer The Android Automerger <android-build@android.com> 1299304606 -0800

merge in gingerbread-release history after reset to gingerbread