am 2b32afd0: am 5ebaf106: merge from open-source master

Browse Source

...

This commit is contained in:

The Android Open Source Project 2010-04-22 13:36:46 -07:00 committed by Android Git Automerger

parent 299d061c82 a5786f8023

commit c642e02f6b

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