Craig Mautner 769a5b72dc Merge "Replace access to mAppTokens with AppTokenIterator"

2013-02-13 19:44:35 +00:00

..

common_time

am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."

2012-09-12 11:08:45 -07:00

input

Remove calls to SkCanvas::setBitmapDevice()

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

java

Merge "Replace access to mAppTokens with AppTokenIterator"

2013-02-13 19:44:35 +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