commit | 25ecf8adca7f825f025477706c5147f54b1836dc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Sep 21 19:30:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 21 19:30:57 2021 +0000 |
tree | 5ce53dbe2787b259ac10ad33e2103017015da965 | |
parent | f0de8f3aff350c069875a8e1b2f139bb62c91f02 [diff] | |
parent | 020343ebd10691d05465b928ece62039390b34ae [diff] |
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735bca5320 -s ours am: a14ca941a8 -s ours am: 225c3e8769 -s ours am: f4c5136dbf -s ours am: accea6ad5e -s ours am: 7694cbfd5a -s ours am: 020343ebd1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15875819 Change-Id: Ib7c475b6589daca5629aa5dbb5a112966cc3a1bf