am 393b2b8f: (-s ours) do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 from master branch

Browse Source

Merge commit '393b2b8fbf39d36337c2763ead76e22a81888e87'

* commit '393b2b8fbf39d36337c2763ead76e22a81888e87':
  do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 from master branch

...

This commit is contained in:

Fred Quintana

2009-08-16 17:20:18 -07:00

committed by Android Git Automerger

parent 4aaab1583a 1c01c8bc79

commit c56d4aebfa

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