Android: make a distinction between success and cancel when adding an event
Merge remote-tracking branch 'origin/master'