| commit | d786a1900e94c4f0c919b50b44667cea32fd2939 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Mon Dec 02 12:37:58 2013 -0800 |
| committer | Katie McCormick <kmccormick@google.com> | Mon Dec 02 12:37:58 2013 -0800 |
| tree | de79d8d23967927e2fcdc944189e0fe6a0b8ddc8 | |
| parent | 866dbc9a73eb18bc47fe2f45c40bbb753b26d27e [diff] | |
| parent | 37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 [diff] |
resolved conflicts for merge of 37e4c405 to master Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd