Jeff Sharkey 116be95495 Merge commit '81eb7640' into mergeit ...

Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350

2012-09-12 16:34:31 -07:00

..

common_time

common_time: Move default election config to bcast.

2012-08-21 16:39:11 -07:00

input

Make input system aware of multiple displays.

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

java

Merge commit '81eb7640' into mergeit

2012-09-12 16:34:31 -07:00

jni

Make input system aware of multiple displays.

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

tests/servicestests

Add components for the Android Config Updater to system server.

2012-09-07 16:50:11 -07:00