Commit Graph

2 Commits (75113ece4482a959f7246d7fa8e1b08fd1da8a78)

Author SHA1 Message Date
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
14 years ago
Tim Su 32b3da0151 Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago