tree 8129dcd55bbda0ae26e54cb2bb92f4fbd2d0604c
parent 9da5812d63e1c6047d532f8b10ae2fc28cab17aa
parent 693599f27be9f3f2d59d3205283133b5b504d3c8
author The Android Automerger <android-build@android.com> 1269374907 -0700
committer The Android Automerger <android-build@android.com> 1269374907 -0700

Merge branch 'master' into froyo-release