commit b9b8a00f1da7d0ccf9c7f4b545abacb7cd1fa464
author Matthew Fritze <mfritze@google.com> Wed Jul 26 20:14:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 20:14:25 2017 +0000
tree 9bb088023c923b83c6f8e6ce4f6b4c75ba225774
parent 9400c41dac67cd9998f17ba2a0a321270c52428e
parent d112e6391b84b55d24eb38e0f20cb478abf52023

Merge "Add metrics event for trampoline activity" into oc-dr1-dev am: 44f7badb73
am: d112e6391b

Change-Id: Ic13893b4cca32a4e014fc8fb96370ee63234a188

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 6167d85..bb6ed74 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -4214,6 +4214,11 @@
     // OS: O DR
     ACTION_CAMERA_EVENT = 1032;
 
+    // OPEN: Settings > Trampoline Intent > Settings page
+    // CATEGORY: SETTINGS
+    // OS: O DR
+    TRAMPOLINE_SETTINGS_EVENT = 1033;
+
     // ---- End O-DR1 Constants, all O-DR1 constants go above this line ----
 
     // ACTION: Settings > Network & Internet > Mobile network > Mobile data