| commit | af1653a851eefb2302d2cb1c7ef3c7325103f2dd | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Wed Apr 17 10:20:23 2013 -0700 |
| committer | Victoria Lease <violets@google.com> | Wed Apr 17 10:33:23 2013 -0700 |
| tree | 4686b7b3316b422adba155b4fb9e5f0e19037298 | |
| parent | a38006d74f987ef0614aef0bc32f35edc0b99b36 [diff] | |
| parent | 6c18e2c89f3f4cbb28d30596d93542223b42912c [diff] |
resolved conflicts for merge of 6c18e2c8 to master Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1