commit f9ef97936c8e108f3ac7f5f85463af2d1c3a1e7b
author Jorim Jaggi <jjaggi@google.com> Thu Feb 04 22:56:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 22:56:37 2016 +0000
tree 08e77ac674af83f77247aa7a28ed763881254b25
parent 5bef2fcce86e9d822e3736bd66faa7e6b300c5bb
parent dd50c3fc15461a7342f5a38fe13fe702c953e1d2

Merge "Fix build"

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 85951ef..e1dd87f 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -342,7 +342,7 @@
 
     // QS Tile for Data Saver.
     QS_DATA_SAVER = 284;
-    
+
     // OPEN: Settings > Security > User credentials
     // CATEGORY: Settings
     // OS: 6.1
@@ -351,6 +351,6 @@
 
     // Logged when the user undocks a previously docked window by long pressing recents while in
     // docked mode.
-    ACTION_WINDOW_UNDOCK_LONGPRESS = 285;
+    ACTION_WINDOW_UNDOCK_LONGPRESS = 286;
   }
 }