Gilles Debunne 2493c164b0 resolved conflicts for merge of 2da9338c to master ...

Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af

2010-10-11 10:37:51 -07:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

resolved conflicts for merge of 2da9338c to master

2010-10-11 10:37:51 -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