diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:35 +0000 |
commit | d16bf361ff259e5465181df3ffb917cc380a1b31 (patch) | |
tree | c0e7bd567323aababb6dcba07acbcf43b34291eb | |
parent | 92ed3bb172f9096f6df03defb93d257e4ad340e8 (diff) | |
parent | de9268b5fe11e7d4370e84c3f960a89431191d88 (diff) | |
download | timezonepicker-android12-mainline-captiveportallogin-release.tar.gz |
Snap for 7550930 from de9268b5fe11e7d4370e84c3f960a89431191d88 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release
Change-Id: Ie4a4341cd650a2bafc98ddcc1d9b61635160c224
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | res/values-ca/arrays.xml | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_library { name: "android-opt-timezonepicker", sdk_version: "17", diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml index a7e4741..f2c1ec7 100644 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -44,7 +44,7 @@ </string-array> <string-array name="backup_country_names"> <item msgid="9141777876082196578">"Sint Maarten"</item> - <item msgid="5330962017221568054">"Carib Neerlandès"</item> + <item msgid="5330962017221568054">"Antilles Neerlandeses"</item> <item msgid="1465164631761814300">"Curaçao"</item> <item msgid="8972081011408691260">"Sudan del Sud"</item> </string-array> |