summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-17 23:24:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-17 23:24:45 +0000
commit64bd1a7e230bc8acbbcb2dfcb1896e4428509913 (patch)
tree94799dfb8bf78160f4ab051445d16aee76d37508 /java/src
parent40985c0526f03ae1602461b1fd9284865af0cf8b (diff)
parent408920d9fb23b15818b927e098231273b83f3236 (diff)
Merge changes from topic "am-dddab5aa66a34c29a56655e9be0a2f79" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 108ac5edee -s ours am: db9915fcda -s ours am: 245bd97a0c -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d86eb488b -s ours am: e784cdb0ea -s ours am: 6d14888ec4 -s ours
Diffstat (limited to 'java/src')
0 files changed, 0 insertions, 0 deletions