tree 7c1c84c080a79c2c4cc31d66b7d8ae80e0f0cc6f
parent ee7d4a3d574d8789fb0d1860eba284ae5099f10d
parent 56782291837a17ebb944c772db5ae20e39d1f3c6
author Nicolas Geoffray <ngeoffray@google.com> 1447948081 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1447948081 +0000

Merge "Rename options for shorter names."