Jean-Baptiste Queru 89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp ...

Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2

2010-10-10 17:45:45 -07:00

..

config

…

java

resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

2010-10-10 17:45:45 -07:00

jni

am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

2010-10-07 15:46:57 -07:00

res

am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread

2010-10-10 16:38:14 -07:00

tests

am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

2010-10-07 17:41:05 -07:00