tree 3ac6acae442b694ba88f236452bc7a03e27bdbab
parent f747183ec022f06d9828cfc909dcd50edebe5789
author Keir Mierle <mierle@gmail.com> 1340006279 -0700
committer Keir Mierle <mierle@gmail.com> 1340006279 -0700

Add to the changes for 1.2.1.

Change-Id: I94d2fa8ffec478950c14649fc761ff7d17dbc0d1