tree 575a5408dad73632cb4a197c87141f77978bfeb1
parent ebf3991a60cbd5f510eb0eae8fe2c2c0e2bca357
parent 418928e9d0168609cc802e95c18930d131147e7a
author The Android Automerger <android-build@android.com> 1258758139 -0800
committer The Android Automerger <android-build@android.com> 1258758139 -0800

Merge branch 'eclair' into eclair-release