Elevate NetEq short-term activity statistics to ACM level for logging.
Review URL: https://webrtc-codereview.appspot.com/1313004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3850 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/neteq/merge.c b/webrtc/modules/audio_coding/neteq/merge.c
index bd5239c..78da2c7 100644
--- a/webrtc/modules/audio_coding/neteq/merge.c
+++ b/webrtc/modules/audio_coding/neteq/merge.c
@@ -535,11 +535,17 @@
     {
         /* expansion generates noise only */
         inst->statInst.expandedNoiseSamples += (*pw16_len - w16_decodedLen);
+        /* Short-term activity statistics. */
+       inst->activity_stats.merge_expand_bgn_samples +=
+            (*pw16_len - w16_decodedLen);
     }
     else
     {
         /* expansion generates more than only noise */
         inst->statInst.expandedVoiceSamples += (*pw16_len - w16_decodedLen);
+        /* Short-term activity statistics. */
+        inst->activity_stats.merge_expand_normal_samples +=
+            (*pw16_len - w16_decodedLen);
     }
     inst->statInst.expandLength += (*pw16_len - w16_decodedLen);