tree 473f23a09612ad606842476ae4fea93e313b7e27
parent 2ca811c530c3cf6f391f860264de1289b0d923e2
parent 3ecbd81f99d2005172f431d2bf207b698154fe29
author The Android Automerger <android-build@android.com> 1260842667 -0800
committer The Android Automerger <android-build@android.com> 1260842667 -0800

Merge branch 'eclair' into eclair-release