ref: 10c7ea4be8b551cea229d4a7a09a807a62f2f445
parent: 3c206aca04e5b9df18c6d2e3bd4a4337f5bb14fb
parent: 7d6edc3ddd607f84991add1cba124b31db518aac
author: Tom Finegan <tomfinegan@google.com>
date: Thu May 12 10:55:07 EDT 2016
Merge "simple_encoder: Add a frame limit argument."