| commit | de22998fdd0a78400c5b8e6fc3609744e90b09c9 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jan 28 19:37:23 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Jan 28 19:37:23 2014 +0000 |
| tree | 66688889ad519fb56fff65ac47a966ca9b5e6aba | |
| parent | e0d1e295f15a5c70ca030732fd9309f0dc50b2cc [diff] | |
| parent | 583b7b16718b2787e64f1f26e476d349b96a909a [diff] |
resolved conflicts for merge of 583b7b16 to master merged with "-s ours" since this change has already been cherry-picked to master.