tree 90f438b1c3e7456ba1687239ae86a155a7e9b102
parent 876952cd42a0044b59d1250dd164528bfb1f2fe7
parent a78512c6812958aeb4515e83b5ebbd7b6018dc76
author The Android Automerger <android-build@android.com> 1270653123 -0700
committer The Android Automerger <android-build@android.com> 1270653123 -0700

Merge branch 'froyo' into froyo-release