tree d483a7b8dd5eea4bc3d318f9e93611186fa88499
parent b1378e94dc9d44df2ac5fcc4281bc1942fafcb72
parent 95b29e3c2273ee52a772ddfd5a672960500b6cbd
author Richard Frankel <rofrankel@google.com> 1474405759 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1474405759 +0000

Merge "conman:  Minor cleanup."