Work on the android sample

Work on the android sample