Improve Android sample