tree 062ae8a984dd7effb8fa6f95c055bac0b1be2dd1
parent 96a253a184592ace045a384e7b1d51a30a454448
author Ian Rogers <irogers@google.com> 1319771333 -0700
committer Ian Rogers <irogers@google.com> 1319771333 -0700

Fix merge of short constants to not give int.

Change-Id: I34a2be26cab72af759ec9fa9f6e7470bb43923eb