| commit | 0e8ad3b4af92851d8a8af21cd6c5a9537581fe52 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:34:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:34:30 2021 +0000 |
| tree | 5feffc0eba63cac9df8f0b9f58a268a88e526bf0 | |
| parent | 52165df7777146e1565973fe0110b6fbdf9cf038 [diff] | |
| parent | f60673bea73761cb4b40a57ba9ad9d6e85aed9dd [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1c5b9275b5 -s ours am: b7a755805d -s ours" into sc-qpr1-dev-plus-aosp am: f60673bea7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807887 Change-Id: Ia72efa1802f15383bfbd601b78014f1348ba102f