commit | 63441c41c5024fd0ea4adb24515692e215df0152 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 01:50:54 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 01:50:54 2022 +0000 |
tree | 215701b535f767f591bcac63ff6e9345e86cc435 | |
parent | efa4d523092ef5a242e1e4cacfe640120e5e2ef9 [diff] | |
parent | befa0858c15f11c48ae8a3b2333e0ac1141f3fa2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dfcbf9b1ca -s ours am: a40e10b6f1 -s ours am: befa0858c1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943420 Change-Id: I5f97ccadec357854028061fd8d4a5e425a206698