summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-01-11 01:24:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-11 01:24:52 +0000
commit92de5a35a7cebb2b934d79c41e37aaec00d0532b (patch)
treed8eb8ae58f6d5f23d05bf9ba9d99e182d260ac24 /core/java
parent82a64a1b8b898520a783a3c5b2fe396772309336 (diff)
parent64a35bb77d78faee83d94f1b6bcc091fbb2b32db (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0c768dbc80 -s ours am: 64a35bb77d -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943277 Change-Id: Ic7ce65b13996fcd5b2fde3158bdc8812829b9419
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions