ref: 60ef6c073556b75fe46754a6ae5ca1008ffea8b4
parent: e6fb9c0b0b23355a00ced121b213e1aa13f1a7a5
parent: 0496d114863a66914971f4153dcaf31af7613673
author: Alex Converse <aconverse@google.com>
date: Mon Nov 24 11:36:53 EST 2014
Merge "Fix a tautological assert."