tree 9696a0c2a49a926d3052ff79e594f4d01a73a1d0
parent e3280563761776c73e797a2b342641da42c979bd
parent 2cc62e82b4499c5c12a4d9157d785f9213999e5c
author The Android Automerger <android-build@android.com> 1268924854 -0700
committer The Android Automerger <android-build@android.com> 1268924854 -0700

Merge branch 'master' into froyo-release