commit | 8de2dabe83984d8f013b41a07750b7acc9840357 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 08:37:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 08:37:01 2020 +0000 |
tree | 999271e5acef206d196c847b6808bb14cb144d23 | |
parent | 1842ed0a4f80fe8f65754180ee76a13bc47342b6 [diff] | |
parent | aca4566be72a6e7cddff73be93645ba63a09c870 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ec08343fc5 -s ours am: 063c5052f8 -s ours am: 47d8fdb784 -s ours am: aca4566be7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419990 Change-Id: Iee07eec6694d9f7f20a33bb5327dec5f6c25855d