tree 42731a86dab195a621a874b26248284cb0c7b76c
parent 1ffa2b2e03a2c9acfbac30a913c3cefc7c13e624
parent bfa6aefec64c3c0784856aaf626e4aee325f011e
author Clay Murphy <claym@google.com> 1417547330 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1417547330 +0000

Merge "Docs: Fixing bad merge."