commit | 5c1e74b01c8e3dd34437d35cb47b44d127663faf | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 27 18:48:40 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 27 18:48:40 2021 +0000 |
tree | e0ab92ba879065bb93d8a9ca1f6e0efcc918426c | |
parent | 4f3307952c10ed0cc9a8b6af8ee7e48d4b3975ac [diff] | |
parent | 30fb090fd1a5680ad4e5de481e527e1dc405e702 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 30fb090fd1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747104 Change-Id: I4caa9268538c8fd37c353c1977c789dd88c53838