| commit | 157a9484fa49963b2210de50930c51fa69e7d397 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jan 04 01:51:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 04 01:51:40 2021 +0000 |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 | |
| parent | d568c6cf475b7d01494662ce0bd6c2806fa745e5 [diff] | |
| parent | b6f4c3010715f7eeeddc38ef48cc73c98781eeb7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 732d874fb8 -s ours am: b6f4c30107 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13283087 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c637bb7b145f31ac54c45e5cc538860e24dee32