9 Commits

Author	SHA1	Message	Date
Jimmy Shih	c36a494952	merge heads	2012-03-23 16:26:39 -07:00
Jimmy Shih	a0c766d820	merge heads	2012-03-23 16:09:41 -07:00
Jimmy Shih	5890ddd2d5	merge from main	2012-03-23 14:48:06 -07:00
Jimmy Shih	ff2fe17b2c	fix comment on f87ee43bcbb1	2012-03-23 13:09:22 -07:00
Jimmy Shih	7a203cb608	fix comments for efb2d8ffe652	2012-03-23 13:04:10 -07:00
Jimmy Shih	f876b8cab4	merge heads	2012-03-23 12:37:44 -07:00
Jimmy Shih	db87201724	fix comments for ad1d456e2a96	2012-03-23 12:35:46 -07:00
Jimmy Shih	6ecde2dc7e	fix comment for e4025681f67b	2012-03-23 12:18:52 -07:00
Jimmy Shih	bc9ff8b4b1	Fix several Android lint warnings using ADT 17.	2012-03-21 18:06:20 -07:00