am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0': Ignore duplicate WAP push PDU source/destination port if configured
This commit is contained in:
commit
59ee48942b