| commit | 52fa083884c0475f8e975fcfc7fa28eba7f9701c | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Sep 30 07:40:09 2015 -0700 |
| committer | Rom Lemarchand <romlem@google.com> | Mon Nov 16 08:53:04 2015 -0800 |
| tree | fed3f42e179dc3153cec630a463c61bb8d2c59ad | |
| parent | 6510ff7a84f53d84b73a0c2aa0d26fe3e4b40a99 [diff] |
logd: use coalesce instead of merge (cleanup) (cherry pick from commit aaad42f47c7363d68ddfb9ef8f1b51972c4d429d) - switch to coalesce instead of merge in naming of functions and variables. Confusing since we also to merge-sorts and other activities in the logger. - define maxPrune rather than using a number in the code path. Bug: 24511000