Robert Greenwalt 72baa8fbb2 Merge "Reintroduce the net.dns system properties <TEMP>"

2013-02-11 23:57:47 +00:00

..

common_time

…

input

Remove calls to SkCanvas::setBitmapDevice()

2013-01-08 10:00:54 -05:00

java

Merge "Reintroduce the net.dns system properties <TEMP>"

2013-02-11 23:57:47 +00:00

jni

Merge "BatteryService: Treat USB charging ports and charging accessories as AC"

2013-01-30 23:20:18 +00:00

tests/servicestests

Fix UserManager test

2013-02-11 15:47:30 -08:00