commit | c41cf1e834f2ac9d0c4222b42ce5ea9105d50057 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:16:14 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:16:14 2021 +0000 |
tree | d63aed2250a82ef7196b803417f8b49eb1b66032 | |
parent | 800b118e2214e31afe1123fc6b2eb204e26e0c30 [diff] | |
parent | d9048b85a2c48e5430999f08ecfd970c88556e2b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2107755bdd -s ours am: d9048b85a2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15806665 Change-Id: I69ee80786a0dc094ca485d0cdf188aa097bdfc62