tree 507fa33c1d3a353f262bffab553397d27bbfdd5e
parent 881d7baebe3d82ed4078025e811711f26c7b986e
parent e9a8c1c0d525d49d934c901f965d84fa89cbef80
author Grace Kloba <klobag@google.com> 1269636934 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269636934 -0700

Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo