commit | 2499c24cdafffd259b3afc86df5769b21e03bad8 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Aug 28 08:48:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 28 08:48:23 2021 +0000 |
tree | 8ec2e4568130d4bdbdf0a8b1858ed6db6d26a4ea | |
parent | 4d6f32e2704773fccaa01c15135e28d7830bc4c4 [diff] | |
parent | 95a6589e3be519f9b1560d480988fbfd6581d3f4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40b0798fbd -s ours am: 14caec7f5a -s ours am: 95a6589e3b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15692927 Change-Id: I8477e7fbbbe201dc009308352bc66cee98b4c52f