| commit | 5fafa3cb86afc746926a67c2138cf1c1f14b380c | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Fri Aug 26 15:00:49 2016 -0700 |
| committer | Doris Ling <dling@google.com> | Fri Aug 26 15:00:49 2016 -0700 |
| tree | e1b64e4361bdb40cc2bbacce41ebe79729bee7e5 | |
| parent | 7edf8335d7fecdd5f9f62c1aab4b7eb90ebf3430 [diff] [blame] | |
| parent | 7eeeb0d90e4c02bb1ec0a90134533d0d0154f074 [diff] [blame] |
resolve merge conflicts of 7eeeb0d to master Change-Id: I11a7b51612a4cfb98b5776d098ca0ec43a75259b
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a7ff552..2b06473 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java
@@ -6466,7 +6466,10 @@ NIGHT_DISPLAY_CUSTOM_END_TIME, NIGHT_DISPLAY_AUTO_MODE, NIGHT_DISPLAY_ACTIVATED, - SYNC_PARENT_SOUNDS + SYNC_PARENT_SOUNDS, + CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, + CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, + SYSTEM_NAVIGATION_KEYS_ENABLED }; /**