3 Commits

Author	SHA1	Message	Date
Jimmy Shih	c815579cb9	merge from main	2011-11-11 12:31:07 -08:00
Jimmy Shih	cc4d57bc0c	merge heads	2011-11-10 16:26:30 -08:00
Jimmy Shih	d5c0b9cd5c	Rename and reorganize menu variables in strings.xml	2011-11-07 17:53:22 -08:00