Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev

Browse Source 
am: cf665232f3

* commit 'cf665232f332faa4d3c0c6247c6e5685684a1b2a':
  Give the auto-merger somthing to hang on to.

Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65
This commit is contained in:
Chris Wren
2016-06-02 20:35:27 +00:00
committed by android-build-merger
parent 036f8ac188 cf665232f3
commit 18455a9108
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proto/src/metrics_constants.proto
View File

@@ -2256,6 +2256,8 @@ message MetricsEvent {
// CATEGORY: SETTINGS // CATEGORY: SETTINGS
SETTINGS_GESTURES = 459; SETTINGS_GESTURES = 459;
// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
// Add new aosp constants above this line. // Add new aosp constants above this line.
// END OF AOSP CONSTANTS // END OF AOSP CONSTANTS
} }