You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tasks/greendroid/GreenDroid/res/drawable
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
14 years ago
..
gd_action_bar_item.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_quick_action_bar_item.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_quick_action_grid_selector.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_segment_checkmark.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_segment_label.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_tab_indicator.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago