| commit | d6e89f519a55eb13e63e0d5ade7358951551795e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 05:23:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 05:23:02 2020 +0000 |
| tree | 26da2b660044f205549652cbf2aa2abf47f06e3d | |
| parent | e27de32a8fa318c67e9a8ff8d8711618b3ea98cb [diff] | |
| parent | 60e40d9c33a63b46f9accb2422955e873076925d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours am: 4ec3aa4d09 -s ours am: 60e40d9c33 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618 Change-Id: Iecb08d5fcc0faf6076586a5d3b47d7b583d62378