tree 0582058a39a1eed171d066d03adb04e47625f736
parent b101f8795a3d3d1c1f5c403bafec93f3d90d0360
parent d3e37d14e755f07c7d10925514fdf7267a6abf04
author Elliott Hughes <enh@google.com> 1422979661 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1422979662 +0000

Merge "Trivial cleanup of recent changes."