tree 1e44b4e9a77399891cc6b198ac819d075e7061df
parent 8178101f1f8d05eb72bcd7da933e0b26280e36a3
parent e1cc6c3745c9ba721b6ab888d74c9d9e1d13ea6a
author The Android Automerger <android-build@android.com> 1273255076 -0700
committer The Android Automerger <android-build@android.com> 1273255076 -0700

Merge branch 'froyo' into froyo-release