tree 76b13e60b2bf8659fb1da6288d3b283ab88a0d8f
parent 03bba1a30ae1d5a4c14fd20438fbb926580cd747
parent 499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0
author The Android Automerger <android-build@android.com> 1264475318 -0800
committer The Android Automerger <android-build@android.com> 1264475318 -0800

Merge branch 'eclair' into eclair-release