| commit | b6bec330c2d1d564b31d50460b36ac5834826b00 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:14:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:14:09 2020 +0000 |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
| parent | 44e090521d136613181cc3e40ab00d7879268ff9 [diff] | |
| parent | 8fd78a83ee971112a09c2251b03f16ed1e57e904 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518032 Change-Id: Iaa94c23d83065a82df2efbd69078af3fc1a2b599