commit | 38957d5fba1a40cf5368e0b06e440eb80f2b7428 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:15:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:15:18 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | 01a0745efd93564c6db8dfe1497a5e3370adcb82 [diff] | |
parent | 728faae9c6ee2b8cea4c0a22e78e82b0cad804af [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519385 Change-Id: I89a8bf2848bab75410474218fb5bbd34f9b1d03f