| commit | 665990de686c1a80fc82e383d663696574a5e406 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 09 16:57:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 16:57:34 2021 +0000 |
| tree | 21cd2a75024b46a463773d3d21686002cf806436 | |
| parent | 8b2c414158e2792b65041a432d416dec5fe28d7b [diff] | |
| parent | 1056c280ecda0da1ddbb16a807d09ae833faacb6 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ac707691f4 -s ours am: bd805ca304 -s ours am: b2cb6a3200 -s ours am: 69a6af424e -s ours am: 1056c280ec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747690 Change-Id: I2373cd20f63bc9bcd6a69316f60c8fc0373a061c