commit | 56a19dcb277f9bbd564eb93a17615eecb271af99 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 29 07:01:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 29 07:01:30 2021 +0000 |
tree | fffbadfb979a1849c1bf40e0f93c46cfbd0ac191 | |
parent | 828246482b62948ede17e2485f53ec335f6ff7b9 [diff] | |
parent | 5fac21a0d4fd6fe6118cbe881b494069f4b66089 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours am: 5fac21a0d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936292 Change-Id: I6f394aa1e19cab677f14acb6f2bc9ae9499386df