Robert Greenwalt 4600139173 am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread ...

Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp

* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
  DO NOT MERGE Do not kill sockets going default->hipri

2010-08-18 15:14:31 -07:00

..

config

…

java

am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread

2010-08-18 15:14:31 -07:00

jni

Revert "- updates NetUtils to use new libnetutils headers"

2010-08-18 11:16:42 -07:00

res

am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"

2010-08-17 07:48:50 -07:00

tests

am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread

2010-08-18 13:35:47 -07:00