Merge remote branch 'origin/flx' into modular
tree927158e900ff81738464625be26f37cd041242c9
-rw-r--r-- 337 .classpath
-rw-r--r-- 123 .gitignore
-rw-r--r-- 989 .project
drwxr-xr-x - .settings
-rw-r--r-- 3252 AndroidManifest.xml
-rw-r--r-- 35147 COPYING
-rw-r--r-- 2668 build.xml
-rwxr-xr-x 142 builddoc.sh
-rwxr-xr-x 615 bump.sh
drwxr-xr-x - connectors
-rw-r--r-- 469 default.properties
drwxr-xr-x - hi-res
drwxr-xr-x - libs
-rwxr-xr-x 108 postDeploy.sh
-rwxr-xr-x 212 preDeploy.sh
drwxr-xr-x - res
drwxr-xr-x - src