resolve merge conflicts of f77256e to studio-1.4-dev.

Change-Id: If93cdb0d87ee566862c6ea742c7038bfc2fe3a17

1 files changed, 8 insertions, 0 deletions

diff --git a/android/src/org/jetbrains/android/run/AndroidRunningState.java b/android/src/org/jetbrains/android/run/AndroidRunningState.java
index 348c328464c..4f739cb95a7 100644
--- a/android/src/org/jetbrains/android/run/AndroidRunningState.java
+++ b/android/src/org/jetbrains/android/run/AndroidRunningState.java
@@ -921,11 +921,19 @@ public class AndroidRunningState implements RunProfileState, AndroidDebugBridge.
     }
   }
 
+  private static int ourInstallationCount = 0;
+
   private static void trackInstallation(@NotNull IDevice device) {
     if (!UsageTracker.getInstance().canTrack()) {
       return;
     }
 
+    // only track every 10th installation (just to reduce the load on the server)
+    ourInstallationCount = (ourInstallationCount + 1) % 10;
+    if (ourInstallationCount != 0) {
+      return;
+    }
+
     UsageTracker.getInstance().trackEvent(UsageTracker.CATEGORY_DEPLOYMENT, UsageTracker.ACTION_DEPLOYMENT_APK, null, null);
 
     UsageTracker.getInstance().trackEvent(UsageTracker.CATEGORY_DEVICE_INFO, UsageTracker.DEVICE_INFO_SERIAL_HASH,