Merge "Properly set segmentation for error-resilient mode"
authorYaowu Xu <yaowu@google.com>
Fri, 22 Jan 2016 16:52:41 +0000 (16:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 22 Jan 2016 16:52:41 +0000 (16:52 +0000)

Trivial merge