commit | 26eec47dc1883acdc13534a95f8cb943186df46b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Sep 24 22:50:31 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 24 22:50:31 2021 +0000 |
tree | d94f23aa166d55070a99ac2006080d5639b8f4d0 | |
parent | 76d64e87db0e62a102e498636be839f5704506e5 [diff] | |
parent | 8cb6e80e2df106b0c7e75edeb398e7276af03470 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8cb6e80e2d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901081 Change-Id: I6960aca4cced3ed5e077d50f543c069bbf8e231d