| commit | ba5a56e80f73ef304e144d8fdde70e217115d69c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 14:05:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 14:05:12 2020 +0000 |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc | |
| parent | 337dc9dd75850394c7d905bcb397ed4a8c12a56a [diff] | |
| parent | bd264263309e98551103b1a9f989d9aaa8c0c41a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0496eccd66 -s ours am: 027e5760b4 -s ours am: 6cbb816221 -s ours am: 936bf3042f -s ours am: bd26426330 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419720 Change-Id: I32c686d8611254a2ccee86d63b05ed7013f4c069