tree e6d98e2a757847063c2f4a06438b865f76bdc914
parent 13873eb057e4dca87858173c6845d4ad9787cdda
parent a3cf93a2e7d936375db59628809bc2e20d5ba240
author The Android Automerger <android-build@android.com> 1258425213 -0800
committer The Android Automerger <android-build@android.com> 1258425213 -0800

Merge branch 'eclair' into eclair-release