commit | bd979ab2dd510736f521c9f5e19297096056a504 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 21:32:58 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 21:32:58 2021 +0000 |
tree | 4b5a5a287eafee37cfd5e2f8f779c72c4a141dc7 | |
parent | 2e5ed09e0e2dc055ebe3a5b358060b8d969c98b4 [diff] | |
parent | 70f6ced807f44ef97444f21f2ec263aa8acb3484 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e841b21a2d -s ours am: 4aed3924ff -s ours am: 70f6ced807 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174616 Change-Id: I7e75127a2c52d991e55c72972aa078fa164e6083