Jean-Baptiste Queru 9c9430b30f resolved conflicts for merge of e69f1f1a to master ...

Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8

2010-10-12 09:23:10 -07:00

..

config

…

java

resolved conflicts for merge of e69f1f1a to master

2010-10-12 09:23:10 -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 1457bb0e: am 6b8bdaa9: New AppsPermission and market style

2010-10-11 18:57:14 -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