am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp

Browse Source

* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured

...

This commit is contained in:

Marco Nelissen 2011-06-15 12:20:57 -07:00 committed by Android Git Automerger

parent a6b1dd29b5 dd729fc173

commit 59ee48942b

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