commit | 922a15c1dac3303c3831a3190d8024da78bf6295 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:13:18 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:13:18 2021 +0000 |
tree | 1f7709b410767c293cb8e86789533b1f60d4bef4 | |
parent | e658dc422a84a7c487b7c4a4d3523d9a4d33f048 [diff] | |
parent | 762326338e393e84b63e37e7c5a4131ede2de7fd [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 762326338e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15806214 Change-Id: Idb711f70a1ffe48dfee70cf9154b116c4b7cbc77