tree 1e09b1671e42a79d0c3bbaa61067c005996b3d70
parent 688e64b2d56e4218c680b9d6523c5de672f55757
author Stephen Hines <srhines@google.com> 1315012579 -0700
committer Stephen Hines <srhines@google.com> 1315012579 -0700

Remove obsolete/confusing options and fix strings.

Change-Id: I26b5eeea7ddc8cc4984745daa52635ea95ad7c66