Merge "Remove config_demoModePackage resource" into oc-dr1-dev

am: 934a1081fe

Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f
This commit is contained in:
Justin Klaassen
2017-08-10 06:53:34 +00:00
committed by android-build-merger
2 changed files with 0 additions and 4 deletions

View File

@@ -2810,9 +2810,6 @@
<!-- True if camera app should be pinned via Pinner Service -->
<bool name="config_pinnerCameraApp">false</bool>
<!-- Component that runs demo mode when it is enabled. -->
<string name="config_demoModePackage" translatable="false"></string>
<!-- Number of days preloaded file cache should be preserved on a device before it can be
deleted -->
<integer name="config_keepPreloadsMinDays">7</integer>

View File

@@ -1157,7 +1157,6 @@
<java-symbol type="string" name="lockscreen_transport_pause_description" />
<java-symbol type="string" name="config_ethernet_tcp_buffers" />
<java-symbol type="string" name="config_wifi_tcp_buffers" />
<java-symbol type="string" name="config_demoModePackage" />
<java-symbol type="string" name="demo_starting_message" />
<java-symbol type="string" name="demo_restarting_message" />
<java-symbol type="string" name="conference_call" />