Brad Fitzpatrick f21b4cde18 resolved conflicts for merge of b3ffd4ad to master ...

Change-Id: I80b227b678ef168a45494acf879debed5861de39

2010-10-11 10:46:01 -07:00

..

config

…

java

resolved conflicts for merge of b3ffd4ad to master

2010-10-11 10:46:01 -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