Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b7ef53e authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

Merge "Use inclusive language in framework core test APKs" am: a715792f am:... 

Merge "Use inclusive language in framework core test APKs" am: a715792f am: 6b179932 am: 13d34cbd am: 5b3f78d3 am: 36145d47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: Ibf089288bb2c540a3de6bb85529fbea431a2859a
parents d5bb2767 36145d47

core/tests/coretests/apks/install/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- Just need this dummy file to have something to build. -->

<!-- Just need this placeholder file to have something to build. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="dummy">dummy</string>

  <string name="placeholder">placeholder</string>

</resources>

core/tests/coretests/apks/install_bad_dex/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- Just need this dummy file to have something to build. -->

<!-- Just need this placeholder file to have something to build. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="dummy">dummy</string>

  <string name="placeholder">placeholder</string>

</resources>

core/tests/coretests/apks/install_decl_perm/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- Just need this dummy file to have something to build. -->

<!-- Just need this placeholder file to have something to build. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="dummy">dummy</string>

  <string name="placeholder">placeholder</string>

</resources>

core/tests/coretests/apks/install_loc_auto/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- Just need this dummy file to have something to build. -->

<!-- Just need this placeholder file to have something to build. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="dummy">dummy</string>

  <string name="placeholder">placeholder</string>

</resources>

core/tests/coretests/apks/install_loc_internal/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- Just need this dummy file to have something to build. -->

<!-- Just need this placeholder file to have something to build. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="dummy">dummy</string>

  <string name="placeholder">placeholder</string>

</resources>