commit | 59fd0dc62f380b5ffd8f2f58cbd9996a4006eeed | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 29 20:29:46 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 20:29:46 2021 +0000 |
tree | 50eecd2e5dd2153f190b4f40ccae7f5d7984bddc | |
parent | be965c5455811440f4bb056bd8c4a5b7ba36ed35 [diff] | |
parent | 2415a31cd4d3b90a9c773e2d35a788e1bcf85e51 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2415a31cd4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693275 Change-Id: I7dd5bc3e03efc4dda4ee30bbf576a9783fad1bb2