Merge changes I67890f52,I33c72799
authorJames Zern <jzern@google.com>
Mon, 16 Mar 2015 19:28:46 +0000 (12:28 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 16 Mar 2015 19:28:46 +0000 (12:28 -0700)
* changes:
  usage.dox: fix encoder/decoder subpage list indent
  usage.dox: fix doxygen warnings in 1.8.x


Trivial merge