tree e08601e7df46dac32fb724aef1fc3baaa001aee0
parent 07024ee7007ba0d9c1ef6c941b31f901e5b4e497
author Ian Zerny <zerny@google.com> 1575368352 +0100
committer Ian Zerny <zerny@google.com> 1575368352 +0100

Fix names after implicit merge conflict.

Change-Id: I937780417a9a1ed4f353ed15d29c49eb85902fa9