tree 703eda2de8bb94d805c36a261c810989694e8ee2
parent 22236d8d01ead57923f22aaac174cb7e274188fd
author Elliott Hughes <enh@google.com> 1450284305 -0800
committer Elliott Hughes <enh@google.com> 1450284305 -0800

More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a.

Change-Id: Id936946375d2be56ba10bf3aa5804f52cdbecc2d