WP-1260: Android build 20131029
Merge pull request #5 from gguowei/wp-1260

WP-1260: Android build 20131029