git cherry pick android studio