Robert Greenwalt a8e0dfae06 resolved conflicts for merge of db46fa25 to master ...

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6

2011-05-02 14:41:57 -07:00

..

audioflinger

audioflinger: don't do work in constructor, instead do it in onFirstRef

2011-04-27 16:20:22 -07:00

camera

audio/media: convert to using the audio HAL and new audio defs

2011-04-27 13:10:10 -07:00

input

Make InputWindow.h's window types align with WindowManager.java's.

2011-04-27 14:08:17 -04:00

java

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00

jni

Initial checkin of spot presentation for touchpad gestures.

2011-04-19 15:35:51 -07:00

sensorservice

frameworks/base: remove LOCAL_PRELINK_MODULE

2011-03-14 14:25:59 -07:00

surfaceflinger

am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"

2011-05-02 10:12:00 -07:00

tests/servicestests

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00