| commit | 163ee415d395a756fd06d02b32a7402e2b34f276 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 21:24:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 21:24:20 2020 +0000 |
| tree | e93bd2e9997638fc87685f6433e00b5f5f410dce | |
| parent | e6218fa7d977574d7db65a84d0b3e0399979f214 [diff] | |
| parent | f38f1e5556ebb3d5288714f4a011e79f4cd87d92 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: fad6fe50e1 -s ours am: bd71815c7b -s ours am: f38f1e5556 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155 Change-Id: Ia436ee4f16b8eaf3eb156dfc6dc9fb28702cba91