am 17699b38: merge from open-source master

Browse Source

Merge commit '17699b38df6e87e301d3b33c6955a15c097ecaff'

* commit '17699b38df6e87e301d3b33c6955a15c097ecaff':

...

This commit is contained in:

Jean-Baptiste Queru

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

committed by Android Git Automerger

parent 0635134992 fd17c0c6ed

commit b5312d8f23

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