commit | 6dd84a0450f71fc60eb78ad24b64cb85a4430135 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 01 13:48:09 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 13:48:09 2021 +0000 |
tree | 96cb551a2b2f50fa48a4653b84f22d6b47411233 | |
parent | 7beea44931465883b40aa31b0c210dc1522660e3 [diff] | |
parent | e252ac9b635b7ecb2bb2cec2528633429c88bb9f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ad7cb3d92f -s ours am: 1600f8ebef -s ours am: e252ac9b63 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15157557 Change-Id: Ib12553c14b90a13ab48a066cd3a61746868c8492