| commit | 9c3c3004c4206da3f2579e863ce89a2f99269dd6 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jun 15 12:20:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 15 12:20:57 2011 -0700 |
| tree | 37787227e0cf11666f31f0b2bb10c6c53331fd9d | |
| parent | 2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0 [diff] | |
| parent | d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0 [diff] |
am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp * commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0': Ignore duplicate WAP push PDU source/destination port if configured