Merge "Extension of segmentation to 8 segments." into experimental
authorPaul Wilkins <paulwilkins@google.com>
Wed, 24 Apr 2013 16:44:48 +0000 (09:44 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 24 Apr 2013 16:44:48 +0000 (09:44 -0700)

Trivial merge