Cleaning up Android offline sample
Adding conflict resolution options and UI for offline