tree 15b1632047fa80ba3f8d0236e5b1fbc393b1577f
parent bffb364bdb5371e9f03ef91edb9944f357507a1b
parent 357f5bc804fc80f06776e1da141e4b322d7e3248
author The Android Automerger <android-build@android.com> 1257524368 -0800
committer The Android Automerger <android-build@android.com> 1257524368 -0800

Merge branch 'eclair' into eclair-release