First commit for in-app billing API
fix double mActivity declaration
Merge branch 'master' of github.com:kivy/python-for-android into billing-api
add fixes from json / purchasetoken: http://stackoverflow.com/questions/12002788/subscription-sample-missing-json-parsing-of-purchasetoken
Merge branch 'master' into billing-api

Conflicts:
	docs/source/android.rst
	recipes/android/src/android.pyx
	recipes/android/src/android_jni.c
	src/build.py
	src/src/org/renpy/android/PythonActivity.java
	src/templates/AndroidManifest.tmpl.xml
Merge branch 'master' of https://github.com/kivy/python-for-android into billing-api
Add apt-get install libsqlite3-dev to FAQ on sqlite3

Ubuntu was chosen for the example because the pre-installed VM is Ubuntu
remove double-blacklist for _lsprof.so
Merge branch 'billing-api' of git://github.com/bob-the-hamster/python-for-android
fix _scproxy on osx
add missing _scproxy.py for osx
add API for listening onActivityResult and onNewIntent event in Activity
big refactor of the android module, as well as a better documentation
Merge branch 'master' of github.com:kivy/python-for-android
new android.activity module, that provide bind/unbind() method for on_new_intent / on_activity_result events.
android.activity: fix unbind and activity result bind()
remove invalid kivy_stable recipe
reorganize autoclass in android.runnable
Merge remote-tracking branch 'upstream/master'