Mike Lockwood 69ccdbd78a Merge commit 'bc52ca2' ...

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da

2012-04-03 11:53:47 -07:00

..

common_time

New clock sync control loop.

2012-02-17 09:46:37 -08:00

input

Add Java wrappers for new atrace functionality.

2012-03-09 15:43:50 -08:00

java

Merge commit 'bc52ca2'

2012-04-03 11:53:47 -07:00

jni

fix libgui header location

2012-02-27 13:03:08 -08:00

sensorservice

…

tests/servicestests

User management and switching

2012-03-27 11:23:01 -07:00