sp
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=51195093
Merge remote-tracking branch: upstream/master