tree b8160e28ce329f3acdeb7bb73049a6c3213702f8
parent e1efe23ff718d25c5f3d5ef7914f05f8f739eee5
author Dan Albert <danalbert@google.com> 1400536153 -0700
committer Dan Albert <danalbert@google.com> 1400536153 -0700

Really fixes the ub branches

Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2