tree c8546a1d3cb4e81168316880b8e0a0a491714544
parent c1e1ea37099058b2f650b3de3616557b3ceed1d7
author Brad Ebinger <breadley@google.com> 1502826536 -0700
committer Brad Ebinger <breadley@google.com> 1502826536 -0700

Fix another Merge Conflict

Deleted a variable in a merge conflict without
deleting the usages.

Test: Manual
Change-Id: Ie2db948fded0909508e9155199e75a71702670d5