commit | 318c29bb7842d3da3addefe6ecbae754bade6c47 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Sep 24 18:59:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 24 18:59:01 2021 +0000 |
tree | e21ae50991cb74fc19e5fa9a2659fff91f7c380e | |
parent | d4696e700905594a9ffb2058988de875759c6596 [diff] | |
parent | 7be5cdf97d2e8b0737642f454ab88e49edf9c404 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7be5cdf97d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902916 Change-Id: Ic53feb1d96df55b9625078d37dea49cca20b99c9