tree a6336fb3e2ef97c7c8a712929709b6c99c41f8a9
parent b438e144789a8c40329aa3035a5d286fccd5ec09
parent 730c408ccc76dd7da2235a9af6c84d98d19e6b72
author The Android Automerger <android-build@android.com> 1258997338 -0800
committer The Android Automerger <android-build@android.com> 1258997338 -0800

Merge branch 'eclair' into eclair-release