commit | 847b12ba6393faebde39e9dc0abcf959e1dabd20 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:52:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:52:40 2020 +0000 |
tree | a187e807e41d3cd64432a941cba2261f6a47871a | |
parent | 715c762475e728aa989c68203fecf70b66b64435 [diff] | |
parent | 4f4b55a5570f11e6cc71a6c4e762b160d7ea4cd8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0b0827502 -s ours am: 79dff73fcc -s ours am: d6fee88939 -s ours am: 4f4b55a557 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759561 Change-Id: I679444b50436471abaed316e4d94b066956a9703