commit | 155857440ff4f329352b78f8ee814ddd5338a6f0 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 08 16:52:48 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 16:52:48 2022 +0000 |
tree | 0b610d7d7a05c132633c35da7066cabed003bb73 | |
parent | bbee637d8002733c1150c0892ded6beafa525915 [diff] | |
parent | ad8d18c958ba0f8a7e80f9cc6968af14f1c76a48 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4574ba6620 -s ours am: ad8d18c958 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17616419 Change-Id: I6aae56fdbe3255125a52175f7652391896b60216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>