tree bb40308a44a4d0ac073480f515e13bad1c183f4a
parent e6fa41e1d82f24222361a1e537f8858ba3880774
parent b0c27f254a9929be208d5e04554f438076c833bc
author The Android Automerger <android-build@android.com> 1259772599 -0800
committer The Android Automerger <android-build@android.com> 1259772599 -0800

Merge branch 'eclair' into eclair-release