am 3a0576a4: merge from open-source froyo

Browse Source

Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':

...

This commit is contained in:

The Android Open Source Project 2010-07-28 11:35:24 -07:00 committed by Android Git Automerger

parent 989fade304 3a0576a418

commit 609fef7173

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available