Dianne Hackborn e6634981f1 resolved conflicts for merge of 9c7489f8 to master ...

Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4

2010-10-22 14:35:09 -07:00

..

audioflinger

am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread

2010-10-07 12:23:39 -07:00

camera

Mirror the preview for front-facing cameras. do not merge

2010-10-20 18:29:18 +08:00

java

resolved conflicts for merge of 9c7489f8 to master

2010-10-22 14:35:09 -07:00

jni

am c20f205d: am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"

2010-10-21 13:46:41 -07:00

sensorservice

…

surfaceflinger

am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread

2010-10-21 13:48:36 -07:00

tests/servicestests

…