commit | 47ec02b5bb47ad5aae3d600f08068c9337e4f682 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 22:19:03 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 22:19:03 2021 +0000 |
tree | de0df870edd0fc6fbe213b197aa6d5ecd801968d | |
parent | 13565a78a978d93ae2c29f5432e1e1d41ec7849a [diff] | |
parent | fd0773cb29640563bffa2fb04322454439df016a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am: 361353f28b -s ours am: fd0773cb29 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162029 Change-Id: Icc93735b84bac2c90ea8f2421b891403e2d30b96