Merge "Fix active_map speed 6."
authorAlex Converse <aconverse@google.com>
Fri, 8 Aug 2014 16:30:47 +0000 (09:30 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 8 Aug 2014 16:30:47 +0000 (09:30 -0700)

Trivial merge