| commit | 844046996024f57c7426be3a3f96f6f4695004d4 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Fri Jan 15 15:53:35 2016 -0800 |
| committer | Stephen Li <stephenli@google.com> | Fri Jan 15 15:53:35 2016 -0800 |
| tree | eea987cdcd2a3c5fa0af1d71055c7715df27426a | |
| parent | aa92d08b1dcd9d1c26d30fbcb3a345f0b2a3a538 [diff] | |
| parent | dcd4a64f66b05d32dfec0fa2d0bf344273d9758f [diff] |
Merge -s ours commit 'dcd4a64f66'