Jason Simmons 1b6bb1ed86 resolved conflicts for merge of 35c0bf31 to ics-aah ...

Change-Id: If736c93821359a2f97a0670ad3be8ada5f398bd7

2011-08-29 16:16:49 -07:00

..

aah_timesrv

Reintroduce a line of code which disappeared during reformatting.

2011-08-29 13:09:24 -07:00

audioflinger

resolved conflicts for merge of 35c0bf31 to ics-aah

2011-08-29 16:16:49 -07:00

camera

Pass camera frame metadata from camera service to Java.

2011-08-02 15:48:41 +08:00

input

Merge "Add a "show touches" option for demos and presentations. Bug: 4569045"

2011-08-29 14:04:31 -07:00

java

am 8d3feb62: Merge "Add a "show touches" option for demos and presentations. Bug: 4569045"

2011-08-29 15:18:46 -07:00

jni

am 8d3feb62: Merge "Add a "show touches" option for demos and presentations. Bug: 4569045"

2011-08-29 15:18:46 -07:00

powermanager

Fix issue 4604090: notification sound interrupted.

2011-07-25 18:41:12 -07:00

sensorservice

Fix a few style issues and remove LOG spam

2011-08-24 18:40:33 -07:00

surfaceflinger

Fix screenshots

2011-08-25 14:36:43 -07:00

tests/servicestests

Always splice historical data stats, debug info.

2011-08-26 14:19:54 -07:00