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/layout
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_dashboard.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_action_bar_empty.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_action_bar_item_base.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_action_bar_item_loader.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_action_bar_normal.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_content_dashboard.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_content_empty.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_content_normal.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_description_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_drawable_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_list_content_dashboard.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_list_content_empty.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_list_content_normal.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_long_text_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_progress_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_quick_action_bar.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_quick_action_bar_item.xml wallpaper-background experiment 14 years ago
gd_quick_action_grid.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_quick_action_grid_item.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
gd_segment.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_separator_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_subtext_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_subtitle_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_tab_content.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_tab_indicator.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_text_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
gd_thumbnail_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago