Merge branch 'flx' into modular-prepare
treec3523fa91b9f3b2e2866b9e7225fde9675978b74
-rw-r--r-- 337 .classpath
-rw-r--r-- 111 .gitignore
-rw-r--r-- 992 .project
drwxr-xr-x - .settings
-rw-r--r-- 2759 AndroidManifest.xml
-rw-r--r-- 35147 COPYING
-rw-r--r-- 2668 build.xml
-rwxr-xr-x 615 bump.sh
-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