ref: d4c97f949f9e4ffe3461feacc8adb639c2824d49
parent: 25edb681009779019e4e2a3a1756c61e4ef8fe7b
parent: 72d8b4612cce798cb4d548aebd74d4cbf566dd6f
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Apr 19 10:31:19 EDT 2013
Merge "Clean out some legacy code." into experimental