| commit | 828a6a935e35e42805d45c882314afc5a9df3b66 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:45:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:45:41 2020 +0000 |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
| parent | 307fb22f2d113924212129cc78313a260cd5cc21 [diff] | |
| parent | 81ed4d72509066b4620c2e9fcace0be67c099746 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e7c8fcb8c5 -s ours am: 81ed4d7250 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518323 Change-Id: I4c60ed7d27ba5a289b6b9d34bc698d0ea4204fbc