summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2016-03-01 20:00:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-01 20:00:53 +0000
commiteca23784db8184f2912b0f8c742b58a3b59ad854 (patch)
treefbcf4e26a0203eb2823ef1187e904ab0456fd280
parent9da18850475505fc5c0dacd3100ae95128b9bd65 (diff)
parent159ef7b4e9fe7de4b1e671bf56c510c64360e728 (diff)
Merge "Improve mergeability of metrics_constants.proto" into nyc-dev
-rw-r--r--proto/src/metrics_constants.proto4
1 files changed, 4 insertions, 0 deletions
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index ffc3103275c0..4cc1363f2cae 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -1903,5 +1903,9 @@ message MetricsEvent {
// App requested access to a directory it has already been granted
// access before; action pass package name of calling package.
ACTION_SCOPED_DIRECTORY_ACCESS_ALREADY_GRANTED_BY_PACKAGE = 331;
+
+ // Add new aosp constants above this line.
+ // END OF AOSP CONSTANTS
+
}
}