Mathias Agopian 76f56dd598 am ceec31b7: Merge changes I5a218ca1,I853a76d9 ...

* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split

2013-02-15 14:28:22 -08: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

am ceec31b7: Merge changes I5a218ca1,I853a76d9

2013-02-15 14:28:22 -08:00

java

clean-up following Surface split

2013-02-15 12:47:40 -08: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