Amith Yamasani 888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev ...

Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12

2012-09-24 09:26:37 -07: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

Make input system aware of multiple displays.

2012-09-10 15:48:47 -07:00

java

resolved conflicts for merge of 814f5ac3 to jb-mr1-dev

2012-09-24 09:26:37 -07:00

jni

Make input system aware of multiple displays.

2012-09-10 15:48:47 -07:00

tests/servicestests

Multi-user support for the accessibility layer.

2012-09-21 16:48:07 -07:00