commit | 889fa0fae5d505c3dbe49b24677daeec56a4e7e9 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 01 14:11:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 14:11:42 2021 +0000 |
tree | 3f8f95fb00128b7bcfe6c750fa661609a9680adb | |
parent | 73adaad34f405caf9b4e8db164afca4ce6f30555 [diff] | |
parent | 87addf8c699a9c525a9e3e9628d605a1e0b09b19 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 297097cec0 -s ours am: 87addf8c69 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15158775 Change-Id: Id60b08c80f977ad7e236158e105f0086e33299a9