ref: f7bcce91afb858084cb006a3660330af0ad71bb6
parent: 03177cb7fa17977f72b1334979f13e76979cf6c9
parent: 6d6ef8eb3c814687cd937eec66b4f8a659277ace
author: Alex Converse <aconverse@google.com>
date: Mon Mar 23 06:04:38 EDT 2015
Merge "Don't apply active map on key frames."