tree c5cbaad45d810d8d11d30073b5cd455192547511
parent c2501a4852a1ed880d7fcbbb06e720879c8d48ca
parent ffe27b58c77e71641efd3bd4258323cd4c29c39a
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1258521239 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1258521239 -0800

Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-sholes-release