am 60faafcf: merge from open-source master

Browse Source

Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692'

* commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':

...

This commit is contained in:

The Android Open Source Project 2010-06-30 15:54:38 -07:00 committed by Android Git Automerger

parent ba634dc9f7 60faafcf01

commit 42cfc2cc05

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