diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 05:17:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 05:17:42 +0000 |
| commit | 2d2704ca0e7a8237d0e32657a27cf4e62bffe784 (patch) | |
| tree | 4c0bb16302dde84932e506857f501e41cc23d435 /core/java | |
| parent | 5423a5a3b61e4a3cee43e280fc7c46be3bd5ff98 (diff) | |
| parent | 1a25779d7371b67e8f387b47902cd8f10ff6c4f8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours am: 57e7eba08f -s ours" into sc-v2-dev-plus-aosp am: 1a25779d73 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530
Change-Id: Ibd7bc469a02a3ec3c75b6afa444dc43a6f468b5d
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions