tree 3db5cb38283c120405f3d84349b6a29e2633c055
parent ff3cccb71db060aa5008823130327fe1645a2b1f
parent 6c62bf794493103673a66cc58f7618d4d1e7bc34
author Edwin Kempin <ekempin@google.com> 1544693978 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1544693978 +0000

Merge changes Idcb8982f,I878421e7

* changes:
  MergeUtil: Pass Charset directly to MergeFormatter.formatMerge
  GroupApi: Add method variants with List<String>