am c511d4f8: merge from open-source master

Browse Source

Merge commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353'

* commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353':

...

This commit is contained in:

The Android Open Source Project

2010-06-30 16:02:45 -07:00

committed by Android Git Automerger

parent 364703c6fa c511d4f84c

commit 47598d51b1

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

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

Diff Content Not Available