tree bdaf19217fe4f07396b91caac48f4bc39f85b11a
parent 5b2eaaa161271bdbbb4a67a345eb67752f7673ee
parent 1dd6ff638f14e3c583eaa89d0b7341a3811293da
author The Android Automerger <android-build@android.com> 1260464492 -0800
committer The Android Automerger <android-build@android.com> 1260464492 -0800

Merge branch 'eclair' into eclair-release