summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-19 06:45:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-04-19 06:45:11 +0000
commitbc49b44caf39016b8c1ed8f9246838f3f51c0bc7 (patch)
treeca64c565134fd90720ac52e5a58fd9b37969497b /java
parentb4aebb64de26450b911f4b8a984d8fa53e4194c4 (diff)
parentbd9b7e361f6c4224116759c3a1aec4bb6f850f06 (diff)
Merge changes from topic "am-3324be7194124a63b43a64e9b5596abe"
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2b99e8fe66 -s ours am: e7104551f7 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a45ea2c7ff -s ours am: f646d5bbd1 -s ours
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions