summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-01-11 14:37:44 -0500
committer Jason Monk <jmonk@google.com> 2016-01-11 14:37:44 -0500
commit057ee76e5ccef51572831ed5ee4217dbe9d1fd66 (patch)
tree75faea67338ef809f64ee73deee16751b49ae3a8
parentc06fbb12984a3d3e4c80ab9f819841acae5b0133 (diff)
Fix build
Fix bad merge Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577
-rw-r--r--core/java/com/android/internal/logging/MetricsLogger.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java
index fd859530831c..ce4fc0633a6b 100644
--- a/core/java/com/android/internal/logging/MetricsLogger.java
+++ b/core/java/com/android/internal/logging/MetricsLogger.java
@@ -61,8 +61,7 @@ public class MetricsLogger implements MetricsConstants {
* credentials UI.
*/
public static final int PROFILE_CHALLENGE = 271;
- public static final int ACTION_WINDOW_DOCK_SWIPE = 272;
- public static final int QS_BATTERY_DETAIL = 273;
+ public static final int QS_BATTERY_DETAIL = 272;
public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {