Gilles Debunne 7499a1ca68 resolved conflicts for merge of 5d146549 to master ...

Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b

2010-10-10 16:50:28 -07:00

..

config

…

java

resolved conflicts for merge of 5d146549 to master

2010-10-10 16:50:28 -07:00

jni

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

2010-10-10 12:52:40 -07:00

res

am ea445758: am 08faac3c: Unhide SIP API.

2010-10-10 14:19:29 -07:00

tests

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

2010-10-10 14:19:52 -07:00