Merge "Removing unused alt_activity_measure() function."
authorDmitry Kovalev <dkovalev@google.com>
Wed, 30 Apr 2014 22:50:34 +0000 (15:50 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 30 Apr 2014 22:50:34 +0000 (15:50 -0700)
1  2 
vp9/encoder/vp9_firstpass.c

Simple merge