tree de1b8fa1b3a0abecfae5d319946cd26f554b5269
parent 70ed7eac9316b90a0182fc2eeba015aa0e69b6a5
parent 863e6c40202fe804d92a263809da74ec1e904e66
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1258756885 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1258756885 -0800

Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-sholes-release