ref: 025969d910c39ad43b95447efa2fdd46a335276a
parent: 910136320ca136c17bfe57686c3073475416bbad
parent: 086ae992356b091f555479d41fe23ec34307620f
author: Adrian Grange <agrange@google.com>
date: Thu Apr 24 03:44:41 EDT 2014
Merge "Fixed handling of regularly placed keyframes"