tree 07786505a6af1a4fc0dbef6e39f4d75484cc79ee
parent 8db1c5610f2738c61e9a2c0205a6d61b1cb90736
parent cea4d290c031f27f1aacbf4bd577ed1f01c76844
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