Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev

am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
This commit is contained in:
Chien-Yu Chen
2017-12-03 03:28:40 +00:00
committed by android-build-merger
6 changed files with 0 additions and 273 deletions

View File

@@ -167,10 +167,6 @@
android:key="camera_laser_sensor_switch"
android:title="@string/camera_laser_sensor_switch" />
<SwitchPreference
android:key="camera_hal_hdrplus_switch"
android:title="@string/camera_hal_hdrplus_switch" />
</PreferenceCategory>
<PreferenceCategory android:key="debug_networking_category"