commit | d03af44317bb3d580b6dac25a857caa78d89d6ee | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:17:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:17:33 2021 +0000 |
tree | d63aed2250a82ef7196b803417f8b49eb1b66032 | |
parent | cd0a408c511342e519077ddbbe722d180ccf9534 [diff] | |
parent | e658dc422a84a7c487b7c4a4d3523d9a4d33f048 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54296def63 -s ours am: e658dc422a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15806411 Change-Id: I349554f1d2b9a4133fcf0f3e4507aff2e58f579b