Robert Greenwalt f2b39b4773 am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp ...

* commit '996d60e3a5abe29479b741bd1b346977e4c101aa':
  Add some network types that OEM's are asking for.

2011-01-29 09:35:28 -08:00

..

java/android/net

am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp

2011-01-29 09:35:28 -08:00

jni

Make the interface with DHCP IPv6 capable.

2011-01-26 09:10:01 -08:00