commit | 593f36d311e2bb6db017ff3b1f7711ff9cbe8efc | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 13:24:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 13:24:47 2020 +0000 |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
parent | 04f783cd802a5f2ff74c069f9d2a06001adc761f [diff] | |
parent | 56184dbbc1e2e347a907dd32e3bd4563a88016c0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4a703c2a7c -s ours am: f4ea890b6e -s ours am: 56184dbbc1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419722 Change-Id: I6fb5db542a1d0b0e26a72bb09cbd0074280fd05b