summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-07-21 13:00:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-21 13:00:44 +0000
commit161df5a91a4e37365c87b3d83df5e279db5bf5ac (patch)
tree0ee9c267b254b76c6436267d3f8415db82365224 /core/java
parent12ea29f12cfb117c06f56a0c22b10d36a4bfe98e (diff)
parenta8c628116b4a07597f5dde7d1ff17b0adbff8fa8 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours am: 63ad597247 -s ours am: a8c628116b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15338503 Change-Id: I14242998390950040f0288d9ac2416214680f3f9
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions