Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- infected_@mint-petra ~/cyan_11/frameworks/base $ git status
- # HEAD detached from 4e52b18
- # You are currently cherry-picking.
- # (fix conflicts and run "git commit")
- #
- # Changes to be committed:
- #
- # modified: core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_check_off_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_check_off_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_check_on_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_radio_off_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_focused_holo_light.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_holo_dark.png
- # modified: core/res/res/drawable-hdpi/btn_radio_on_holo_light.png
- # modified: core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
- # modified: core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_check_off_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_check_off_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_check_on_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_radio_off_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_focused_holo_light.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_holo_dark.png
- # modified: core/res/res/drawable-mdpi/btn_radio_on_holo_light.png
- # modified: core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
- # modified: core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_check_off_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_check_on_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_light.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_holo_dark.png
- # modified: core/res/res/drawable-xhdpi/btn_radio_on_holo_light.png
- # modified: core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_check_on_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_holo_dark.png
- # modified: core/res/res/drawable-xxhdpi/btn_radio_on_holo_light.png
- # modified: core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_light.9.png
- #
- # Unmerged paths:
- # (use "git add <file>..." to mark resolution)
- #
- # both modified: core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
- # both modified: core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
- # both modified: core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
- # both modified: core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_dark.9.png
- #
- infected_@mint-petra ~/cyan_11/frameworks/base $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement