commit | 18fc20466cec38480df044b5b7fb66ef1447f650 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 18 19:43:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 19:43:54 2021 +0000 |
tree | 34d2cdcc6078c12dcf067fdd91e94ddd41b2e7b9 | |
parent | 46cbdbdb4c7387516fa2e46e63932a5890669e68 [diff] | |
parent | 31f749d849d22851d1fd5985e0fe2c5789f4a1a0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31f749d849 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598034 Change-Id: I6207c1c201bb0fc2923b1e7971657a0e5ffabdc3