tree d19322dd90c50c633737c4c13a959542cb47d356
parent 54deecfeb92f4baae7785a4183266b7651be1b96
parent 14bee131da68404b33655a241de83c2eeb417559
author The Android Automerger <android-build@android.com> 1259859599 -0800
committer The Android Automerger <android-build@android.com> 1259859599 -0800

Merge branch 'eclair' into eclair-release