ref: fbd73648dd022be5096ab3b86661cd747b3eea89
parent: 88e48444da68155f39957b2b4984ad543d4584c3
parent: b30a06b930b1de5651f2df45a1914214140df278
author: Adrian Grange <agrange@google.com>
date: Tue Jul 30 08:59:46 EDT 2013
Merge "Cleanup typos, remove unnecessary lines, replace switch"