| commit | 56568cb0639499834a4fe5a2cec472a9d9c0e7cd | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:36:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:36:06 2021 +0000 |
| tree | bd142d4237fee796ab3fc2aa73202e4fe18b7a7c | |
| parent | c671e820e3b1548b2eb3f9a2255b9a77c37e6c9e [diff] | |
| parent | e83409a8b031160c997be3573d02a6741f01baab [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours am: e4c51ab8fd -s ours" into sc-qpr1-dev-plus-aosp am: e83409a8b0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544444 Change-Id: I9756c08d27bafc817940099b5b5fb827e2233386