am 54fa2be7: merge from open-source master

Browse Source

Merge commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4'

* commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4':

...

This commit is contained in:

Jean-Baptiste Queru

2009-09-04 11:06:28 -07:00

committed by Android Git Automerger

parent b0c72700e0 54fa2be765

commit 9966e02941

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