| commit | ef439f6ca26644f65a58d306e0294ef2b7405a98 | [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 | f441e982ee0700fb55cc02713b428eed8919de85 | |
| parent | ad2972aee983916f906ffa6f632326c532b2b800 [diff] |
logd: use coalesce instead of merge (cleanup) (cherry pick from commit 95ff2482176e607ea7c77463c75c5443030fe2b2) - 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