diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-23 16:31:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-23 16:31:56 +0000 |
| commit | 4ddd147c4d6ffe276531c653d8da0684ade90828 (patch) | |
| tree | d4dc09dde02308612c6f73482a72e0c0e445797a | |
| parent | 95920f89450dc174cff3da41f798736de76b6473 (diff) | |
| parent | 3a1a64c045ffe89823d8cf2df17655d119f967ba (diff) | |
| download | base-pie-qpr1-s2-release.tar.gz | |
Merge cherrypicks of [5337900] into pi-qpr1-releaseandroid-9.0.0_r20android-9.0.0_r19pie-qpr1-s2-release
Change-Id: I598e03c717e351c29d31f413e3f3132ecd3c4d09
| -rw-r--r-- | core/res/res/values/config.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a9d69c1bcbbe..edeaa1e4ec3f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3515,4 +3515,8 @@ <!-- Brand value for attestation of misprovisioned device. --> <string name="config_misprovisionedBrandValue" translatable="false"></string> -</resources> + + <!-- Component name for default assistant on this device --> + <string name="config_defaultAssistantComponentName"></string> + + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a3ed1b0526d0..864c4acadc6c 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3415,4 +3415,6 @@ <java-symbol type="string" name="config_misprovisionedDeviceModel" /> <java-symbol type="string" name="config_misprovisionedBrandValue" /> + + <java-symbol type="string" name="config_defaultAssistantComponentName" /> </resources> |