android studio git cherry pick