commit | 36bd9805724f7ae59de2773dfb46d62d47732754 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Oct 05 21:22:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 05 21:22:11 2021 +0000 |
tree | e30af5a5235246cb2f2a4b0b44cef62cc8a1ceb8 | |
parent | b8577cf4713f58a88b6d0fba56cac8af6e7d470a [diff] | |
parent | 9c7c96f1fa744ab01a40b775e0cbe076c3fb4be7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: afc0cf9902 -s ours am: cf30115663 -s ours am: 9c7c96f1fa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976634 Change-Id: Ib36d6a49f8fbb078395ab414b63b0846eefbe922