Kenny Root 0a9b54e88b resolved conflicts for merge of 8bb7a1df to master ...

Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9

2010-10-13 15:43:51 -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

Fix camera display orientation.

2010-10-12 15:52:44 +08:00

java

resolved conflicts for merge of 8bb7a1df to master

2010-10-13 15:43:51 -07:00

jni

am 431dd3b1: am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread

2010-10-12 11:50:23 -07:00

sensorservice

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

surfaceflinger

am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread

2010-10-12 13:57:09 -07:00

tests/servicestests

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00