tree ed5882c40205147d59a4d72f836cd1c097f59c58
parent 56ff6fe7f312dab76c365e5b482a6c32e44caaf7
author Carl Shapiro <cshapiro@google.com> 1302559745 -0700
committer Carl Shapiro <cshapiro@google.com> 1302559745 -0700

Add additional asserts and combine declarations with definitions.

Change-Id: Ibdc37f3d7eb6385da1059d5525727b090626ec4c