tree 6f8817a5ce827db3a9b027afbbbb02a36b8c2d6d
parent 0a29eb42253f745a60aeccb67f5ddd5b8b4f6c0a
parent 8cf34293dc2f078bf023ac77d007f5182f9b9357
author The Android Automerger <android-build@android.com> 1260566594 -0800
committer The Android Automerger <android-build@android.com> 1260566594 -0800

Merge branch 'eclair' into eclair-release