Jim Miller 91fd9a9772 Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"

2011-02-16 17:49:17 -08:00

..

config

…

java

Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"

2011-02-16 17:49:17 -08:00

jni

Merge "Remove some unused wifi dhcp code."

2011-02-15 14:26:37 -08:00

res

Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"

2011-02-16 17:49:17 -08:00

tests

Merge "Remove more use of netmask"

2011-02-14 14:48:05 -08:00