commit | 936bf3042f193b44024847614eea04f2ab30d5ef | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:22:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:22:32 2020 +0000 |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
parent | b7287f8ded9c2579d969f0cff95d07898b899ec4 [diff] | |
parent | 6cbb81622164789f2eacad098c789787f3ec1286 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0496eccd66 -s ours am: 027e5760b4 -s ours am: 6cbb816221 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419720 Change-Id: I3b94a692473312bcac790ff2cc2615c7db8977fc