| commit | b2b50a4f427eca454d12945cb553fb65fd80ad79 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:52:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:52:48 2020 +0000 |
| tree | a187e807e41d3cd64432a941cba2261f6a47871a | |
| parent | 847b12ba6393faebde39e9dc0abcf959e1dabd20 [diff] | |
| parent | cf775451c2cb87eb9c71c3206448615182095f9e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54c37b2e14 -s ours am: 9c2d89b123 -s ours am: 05ab7cc711 -s ours am: cf775451c2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759563 Change-Id: I1d4d71bd73888c0bfb55a733663064606c3f2baf