tree 4d998054654239322ad4698647b6e0c490aa36c5
parent 31d15b9f7616ac5605a895ad8fbc3117f0ff4475
parent d0b1934f3115bdcfefecefb487196b5ca6a27aa0
author The Android Automerger <android-build@android.com> 1301689650 -0700
committer The Android Automerger <android-build@android.com> 1301689650 -0700

merge in gingerbread-release history after reset to gingerbread