commit 159ef7b4e9fe7de4b1e671bf56c510c64360e728
author Adrian Roos <roosa@google.com> Thu Feb 25 11:58:32 2016 -0800
committer Adrian Roos <roosa@google.com> Tue Mar 01 11:59:15 2016 -0800
tree 1ab41414150a521bcd865e1bf44f7f0875073512
parent 35293d2ff7de5d98f9bc5a4417de66147f4a1cf5

Improve mergeability of metrics_constants.proto

Change-Id: I6f964d85b5d1b85a04bc8ac2a87453455be93719

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index ffc3103..4cc1363 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -1903,5 +1903,9 @@
     // 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
+
   }
 }