tree 014ebdb83f109bca819552f9331df51afe25ce4f
parent 678efa25a6d0304d17e904aee1563f47cff198ac
parent e69f470933f24977825bb34ee39d32650b75107f
author Christopher Ferris <cferris@google.com> 1508786173 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1508786173 +0000

Merge "Multiple bugfixes, small restructuring."