Commit 18455a91 authored Jun 02, 2016 by Chris Wren Committed by android-build-merger Jun 02, 2016

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

am: cf665232

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

Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65

proto/src/metrics_constants.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -2256,6 +2256,8 @@ message MetricsEvent {
		// CATEGORY: SETTINGS
		SETTINGS_GESTURES = 459;

		// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----

		// Add new aosp constants above this line.
		// END OF AOSP CONSTANTS
		}