resolved conflicts for 99bbec73 to master

Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
This commit is contained in:
Jorim Jaggi
2015-09-09 18:48:27 -07:00
3 changed files with 44 additions and 1 deletions

View File

@@ -7024,4 +7024,9 @@
<!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
<string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
<!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
<string name="camera_double_tap_power_gesture_title">Press power button twice for camera</string>
<!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
<string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
</resources>