Change-Id: I9381a69550a17afbe767b1963a97b7f420ee9104
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

am: e5580385  -s ours

Change-Id: Ie4a73a938b00557f245767a3bc78c4f900dd58e4

am: 4e6a1656  -s ours

Change-Id: Ie9b477d8cafdef509a356400b1643007b54e40e6

am: 1c5760ee  -s ours

Change-Id: I54e64200e282e643df107bd209ba1b913fc84ea3

am: aee9e596  -s ours

Change-Id: I917a46e6bec9e4bf83df1182bb5a95374bddc749

Change-Id: Ic0b774fdb8cbc8507e6534c13b3d64db79031dea
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: I6c77cd10984dd07fe76ae62b4839b801b1aa7650
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: I33047c58713582da7ed206b22faa4ff11024cf9d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: Ib837b11a00db2397e55a6258b4ce69bbd7d93442
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1f  -s ours am: 9467382a  -s ours
am: 4a6a0146  -s ours

Change-Id: I94fa00db6bb4546397583fb22681dcc5dd0a9c3c

am: 9467382a  -s ours

Change-Id: I33d15a705ef8eabba215efb59a4b583111b34265

am: 01422e1f  -s ours

Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8

am: c3e81eb7  -s ours

Change-Id: I0d4709ec6d29fab716e560b3699784f8cc2fc2ba

am: e6889631  -s ours

Change-Id: Icd0cd7480d2692272c8ddebd6e8fb94d1bb0fcc9

am: 03907bda  -s ours

Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec

Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: Ie2ee3d601e39084145911761b1204e5f4cafd219
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

am: 3025a229  -s ours

Change-Id: I0114dbd71207827cabebdfe251cf55ef32d6ce1e

Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: I93dd89f9cd29db52a2660b162a2c00959dc040d2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Change-Id: I5ee735229f2f06ddf12332496d7cc4d27c4bb87c
Auto-generated-cl: translation import

Change-Id: I9670b44e5df11ebb9b81a31afff8f5167e178057
Auto-generated-cl: translation import

Change-Id: I67380e155bb7d31b62e7a429d01823d34b9c57cd
Auto-generated-cl: translation import

Change-Id: Ia8378e5bcb82aafaf51d0e877a14b83c46f21fe1
Auto-generated-cl: translation import

Change-Id: Ia1ba3afca4c2e76f073d9f0fbe4b1cb317eadd59
Auto-generated-cl: translation import

Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8 am: c44dd5a8  -s ours am: dec3c3d0  -s ours
am: da238095  -s ours

Change-Id: I4f8cf81dd24b1c21efb52a166eea70abd1dd8785

Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8 am: c44dd5a8  -s ours
am: dec3c3d0  -s ours

Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218

am: c44dd5a8  -s ours

Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a

am: bde4c9a8

Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4

am: 6736fb29

Change-Id: Ie2bfb2e0c422e7a7e2f9cf96ba38e989d0c3c8a9

am: 6767e059

Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because LatinIMETests's manifest file (AndroidManifest.xml) targets
    API level 21 and dynamically includes the android.test.runner
    library at runtime so there is no point in statically including the
    classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module LatinIMETests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I63f1a8ad16a76aba0da89b69a64cdae4400af5a0
Merged-In: Icab8a4c4801536f112e29dfd2dc66be8b90b811d

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because LatinIMETests's manifest file (AndroidManifest.xml) targets
    API level 21 and dynamically includes the android.test.runner
    library at runtime so there is no point in statically including the
    classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module LatinIMETests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Icab8a4c4801536f112e29dfd2dc66be8b90b811d