tree 16cf7880f6cb9ac4fd0d38d707d6c083469cadf9
parent df2a0ab1b7f11a01925748dd0d2036b9de44d7e0
parent 842ae50050ea2f1ed9c5b3dfa315ff2f6e54204e
author The Android Automerger <android-build@android.com> 1300470106 -0700
committer The Android Automerger <android-build@android.com> 1300470106 -0700

merge in gingerbread-release history after reset to gingerbread