commit | f4a470e96b575bcc9d0f7e3a7a4750823c926e81 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 02:13:45 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 02:13:45 2022 +0000 |
tree | 5d9829ea3546f2f3af638ad8bec9de688b0ea623 | |
parent | df117435adea8bf8425ca9a768bafde51c9b5494 [diff] | |
parent | 1079ccce24154fb217773f37088e1174e4320c6f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7597b365eb -s ours am: 942153072d -s ours am: 92be2d5b47 -s ours am: 1079ccce24 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943416 Change-Id: Ie366cb511f916f618375f049450a84896f7804c4