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
Clarify the documentation about how to use --intent-filters argument
use stable branch for kivy
Add --ouya-icon command line argument to build.py
Add --ouya-category argument which causes the appropriate OUYA-specific intent-filter to be added to AndroidManifest.xml
Merge pull request #119 from bob-the-hamster/ouya-support

Ouya support
Merge pull request #118 from bob-the-hamster/intent-filters-doc-fix

Clarify the documentation about how to use --intent-filters argument
--add-jar command line option for including .jar files to be used with pyjnius
Merge pull request #120 from bob-the-hamster/add-jar

--add-jar command line option for including .jar files
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
mService needs to be static to be useful
Add apt-get install libsqlite3-dev to FAQ on sqlite3

Ubuntu was chosen for the example because the pre-installed VM is Ubuntu
Merge branch 'master' of https://github.com/kivy/python-for-android into billing-api
Added recipe for paramiko
Merge pull request #125 from vkvn/master

Added recipe for paramiko
Fixed recipe for pylibpd
Merge pull request #128 from brousch/pylibpd-recipe-thread-fix

Fixed recipe for pylibpd