summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-09-29 08:55:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-29 08:55:50 +0000
commita908eb6d4fe5d88e3971c8eae8a331101ffcd392 (patch)
tree3c383fc8fca0e4a8d3aae6e26343524c26218810 /core/java/android
parentf88f853c63b24bd5663bb46b16d628a2491012d6 (diff)
parent7cf80aea5a04dd79e53df4d652493fab9e7fa51a (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours am: 7cf80aea5a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935662 Change-Id: I998c62d129c5bf746ffa8f8543ac354af8d6450c
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions