| commit | b38ce845a2f466bea5dbef5ad341769012069b71 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 30 18:14:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 30 18:14:27 2021 +0000 |
| tree | 90b10ea9ed93950d1b0ac9d4a7edc151ead54f27 | |
| parent | 84e814589c68cf879366dbfb7596fc6a401b9a11 [diff] | |
| parent | 2ee849a4ee05d805a887fd70e9b99930a1d04647 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9ed31b86c2 -s ours am: dbab67d9a5 -s ours am: 3848235b26 -s ours" into sc-v2-dev-plus-aosp am: 2ee849a4ee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15692931 Change-Id: I66d640f495a7b0068c95405c64f7f9e730f8b538