Merge changes Idb4d304e,I65a7387a into pi-dev

am: e16d4a8da1

Change-Id: Ied73f75aad11833467efc79fada6710ed3279cea
This commit is contained in:
Lei Yu
2018-04-11 19:39:02 -07:00
committed by android-build-merger

View File

@@ -5644,6 +5644,20 @@ message MetricsEvent {
// OS: P
ACTION_VOLUME_SETTINGS = 1386;
// ACTION: Settings > Anomaly receiver > Anomaly ignored, don't show up in battery settings
// CATEGORY: SETTINGS
// OS: P
ACTION_ANOMALY_IGNORED = 1387;
// ACTION: Settings > Battery settings > Battery tip > Open battery saver page
// CATEGORY: SETTINGS
// OS: P
ACTION_TIP_OPEN_BATTERY_SAVER_PAGE = 1388;
// FIELD: the version code of an app
// CATEGORY: SETTINGS
// OS: P
FIELD_APP_VERSION_CODE = 1389;
// ---- End P Constants, all P constants go above this line ----
// Add new aosp constants above this line.