am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source

* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
  Don't accept a user-defined dun-capable connection

...

This commit is contained in:

Robert Greenwalt 2011-03-11 15:17:44 -08:00 committed by Android Git Automerger

parent bd35d2d88c d395d372c1

commit 3bdb000ce7

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