Merge "Don't apply active map on key frames."
authorAlex Converse <aconverse@google.com>
Mon, 23 Mar 2015 17:04:38 +0000 (10:04 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 23 Mar 2015 17:04:39 +0000 (10:04 -0700)

Trivial merge