tree 58126191341e0f94e6849f2aab9a258190ee3cc2
parent 2bc5d4f713b6126dbf654a7cbbcb2c2480b61a7c
parent eaa01f68f24d78b15275a0ee39bc2d6e53f6733e
author The Android Automerger <android-build@android.com> 1259687195 -0800
committer The Android Automerger <android-build@android.com> 1259687195 -0800

Merge branch 'eclair' into eclair-release