Andrey Kamaev af912f4843 Merged the trunk r8901:8904

2012-07-02 13:46:47 +00:00

..

res

merged trunk r8815:8827

2012-06-28 17:28:27 +00:00

AndroidManifest.xml

merged trunk r8815:8827

2012-06-28 17:28:27 +00:00

CMakeLists.txt

Merged the trunk r8901:8904

2012-07-02 13:46:47 +00:00