Check in latest Android code, fix the API to use the new add/removeCustomDeviceData API in the Android SDK.
Merge branch 'master' of https://github.com/apptentive/apptentive-trigger-io