Jeff Sharkey 22cb5b37a5 Merge "Migrate to using Mockito directly."

2013-02-19 23:29:49 +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

Refactoring: Rename SurfaceTextureClient to Surface

2013-02-15 12:47:40 -08:00

java

Merge "Migrate to using Mockito directly."

2013-02-19 23:29:49 +00:00

jni

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

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

tests/servicestests

Migrate to using Mockito directly.

2013-02-19 15:28:19 -08:00