andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08:00
..
Android.mk	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
Application.mk	Rename module	2015-05-18 15:01:20 +08:00
main.cpp	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00