| commit | 76d1c4567497d9064d65931cbd78434cd8fef402 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 06:41:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 06:41:03 2021 +0000 |
| tree | b68d9d8abb15f933c549633519b56f7481650648 | |
| parent | fd9c6af47d399eee566614e1d4673fd2596f1f21 [diff] | |
| parent | e0ded72ce8d9a743266b0268911c1402887ee9c1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d07abac902 -s ours am: e0ded72ce8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158291 Change-Id: I3e4ca4d19214fff14a19d4b3346f23f53e244a3a