| commit | 6ede0c2cb19707dad28512d0d21dadef69bfdc87 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Aug 31 23:47:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:47:45 2023 +0000 |
| tree | de61f308763f6915abf6d0f5039539c29d339409 | |
| parent | 75ca53f29311ed07e1c9c1ee0c7bde09c57563a8 [diff] | |
| parent | d5dc73fd713b7de5d49be17edaabb0edd32a1a60 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 80385dc6eb -s ours am: f96dbcd390 -s ours am: 0e2bc5f41d -s ours am: d5dc73fd71 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616458 Change-Id: I356d5a89feb12f1c2ab44a3897fe18600ff01e62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>