commit | 6e766a7728665b208097899e3c73d52cc0e063c8 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 23 21:02:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 21:02:47 2020 +0000 |
tree | 8b23e7572d88104a1c56d1ad132d41f80c2be1f7 | |
parent | b68c8bf414c60d1050956fc47748c5401ed1be6c [diff] | |
parent | 30bc6bf3d0f973e49177265016d64bbe12e01962 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am: 30bc6bf3d0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470260 Change-Id: I79e5efb3a72153fdf1cf7ae5e6ab84e3e10bec3f