ref: 7755b9dada8881660826085d8ee8d9034a5c7c53
parent: 6b5490cf68555fa70a8960a9e0f46b888f1ab6d3
parent: 57272e41dda5b575787df357455077eba45a79a1
author: Guillaume Martres <gmartres@google.com>
date: Wed Sep 25 14:04:21 EDT 2013
Merge "Correctly set the segment_id prediction flag and context"