tree e35189cb3924177f88277012118e7b4c28143164
parent 4e1fd432d2098c8f4796735cd3acbdee2b5b7941
parent 5615074876e324863accc8d68ebe567c0041bda5
author The Android Automerger <android-build@android.com> 1258098524 -0800
committer The Android Automerger <android-build@android.com> 1258098524 -0800

Merge branch 'eclair' into eclair-sholes-release