tree fed3f42e179dc3153cec630a463c61bb8d2c59ad
parent 9bc35ef4c975891e2fb77745c877ce8847727b73
author Mark Salyzyn <salyzyn@google.com> 1443624009 -0700
committer Rom Lemarchand <romlem@google.com> 1447692784 -0800

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