3 Commits

Author	SHA1	Message	Date
Edison Su	110465b504	Revert "Merge remote-tracking branch 'origin/javelin' into javelin" ... This reverts commit f237759cd3, reversing changes made to 96bd1d4172.	2013-01-14 17:58:48 -08:00
Alex Huang	54cce5fa18	Getting things to compile	2012-12-28 16:07:56 -08:00
Alex Huang	57c9b4c6b1	Figured out how to add annotations to jackson	2012-12-07 15:21:22 -08:00